From 9cfe8395274ee0ba65cbdcb185b6fb9bdcdde83f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 14 Sep 2008 23:26:51 +0200 Subject: Fix more syntax errors, etc. --- source4/lib/wmi/tools/wmic.c | 82 ++++++++++++++++++++++---------------------- source4/lib/wmi/tools/wmis.c | 12 +++---- 2 files changed, 47 insertions(+), 47 deletions(-) (limited to 'source4/lib/wmi/tools') diff --git a/source4/lib/wmi/tools/wmic.c b/source4/lib/wmi/tools/wmic.c index dc33d71ad1..4b84c27c8d 100644 --- a/source4/lib/wmi/tools/wmic.c +++ b/source4/lib/wmi/tools/wmic.c @@ -54,8 +54,8 @@ static void parse_args(int argc, char *argv[], struct program_args *pmyargs) POPT_COMMON_CONNECTION POPT_COMMON_CREDENTIALS POPT_COMMON_VERSION - {"namespace", 0, POPT_ARG_STRING, &pmyargs->ns, 0, - "WMI namespace, default to root\\cimv2", 0}, + {"namespace", 0, POPT_ARG_STRING, &pmyargs->ns, 0, + "WMI namespace, default to root\\cimv2", 0}, POPT_TABLEEND }; @@ -81,7 +81,7 @@ static void parse_args(int argc, char *argv[], struct program_args *pmyargs) } if (argc_new != 3 || argv_new[1][0] != '/' - || argv_new[1][1] != '/') { + || argv_new[1][1] != '/') { poptPrintUsage(pc, stdout, 0); poptFreeContext(pc); exit(1); @@ -100,52 +100,52 @@ static void parse_args(int argc, char *argv[], struct program_args *pmyargs) } #define RETURN_CVAR_ARRAY_STR(fmt, arr) {\ - uint32_t i;\ + uint32_t i;\ char *r;\ \ - if (!arr) {\ - return talloc_strdup(mem_ctx, "NULL");\ - }\ + if (!arr) {\ + return talloc_strdup(mem_ctx, "NULL");\ + }\ r = talloc_strdup(mem_ctx, "(");\ - for (i = 0; i < arr->count; ++i) {\ + for (i = 0; i < arr->count; ++i) {\ r = talloc_asprintf_append(r, fmt "%s", arr->item[i], (i+1 == arr->count)?"":",");\ - }\ - return talloc_asprintf_append(r, ")");\ + }\ + return talloc_asprintf_append(r, ")");\ } char *string_CIMVAR(TALLOC_CTX *mem_ctx, union CIMVAR *v, enum CIMTYPE_ENUMERATION cimtype) { switch (cimtype) { - case CIM_SINT8: return talloc_asprintf(mem_ctx, "%d", v->v_sint8); - case CIM_UINT8: return talloc_asprintf(mem_ctx, "%u", v->v_uint8); - case CIM_SINT16: return talloc_asprintf(mem_ctx, "%d", v->v_sint16); - case CIM_UINT16: return talloc_asprintf(mem_ctx, "%u", v->v_uint16); - case CIM_SINT32: return talloc_asprintf(mem_ctx, "%d", v->v_sint32); - case CIM_UINT32: return talloc_asprintf(mem_ctx, "%u", v->v_uint32); - case CIM_SINT64: return talloc_asprintf(mem_ctx, "%lld", v->v_sint64); - case CIM_UINT64: return talloc_asprintf(mem_ctx, "%llu", v->v_sint64); - case CIM_REAL32: return talloc_asprintf(mem_ctx, "%f", (double)v->v_uint32); - case CIM_REAL64: return talloc_asprintf(mem_ctx, "%f", (double)v->v_uint64); - case CIM_BOOLEAN: return talloc_asprintf(mem_ctx, "%s", v->v_boolean?"True":"False"); - case CIM_STRING: - case CIM_DATETIME: - case CIM_REFERENCE: return talloc_asprintf(mem_ctx, "%s", v->v_string); - case CIM_CHAR16: return talloc_asprintf(mem_ctx, "Unsupported"); - case CIM_OBJECT: return talloc_asprintf(mem_ctx, "Unsupported"); - case CIM_ARR_SINT8: RETURN_CVAR_ARRAY_STR("%d", v->a_sint8); - case CIM_ARR_UINT8: RETURN_CVAR_ARRAY_STR("%u", v->a_uint8); - case CIM_ARR_SINT16: RETURN_CVAR_ARRAY_STR("%d", v->a_sint16); - case CIM_ARR_UINT16: RETURN_CVAR_ARRAY_STR("%u", v->a_uint16); - case CIM_ARR_SINT32: RETURN_CVAR_ARRAY_STR("%d", v->a_sint32); - case CIM_ARR_UINT32: RETURN_CVAR_ARRAY_STR("%u", v->a_uint32); - case CIM_ARR_SINT64: RETURN_CVAR_ARRAY_STR("%lld", v->a_sint64); - case CIM_ARR_UINT64: RETURN_CVAR_ARRAY_STR("%llu", v->a_uint64); - case CIM_ARR_REAL32: RETURN_CVAR_ARRAY_STR("%f", v->a_real32); - case CIM_ARR_REAL64: RETURN_CVAR_ARRAY_STR("%f", v->a_real64); - case CIM_ARR_BOOLEAN: RETURN_CVAR_ARRAY_STR("%d", v->a_boolean); - case CIM_ARR_STRING: RETURN_CVAR_ARRAY_STR("%s", v->a_string); - case CIM_ARR_DATETIME: RETURN_CVAR_ARRAY_STR("%s", v->a_datetime); - case CIM_ARR_REFERENCE: RETURN_CVAR_ARRAY_STR("%s", v->a_reference); + case CIM_SINT8: return talloc_asprintf(mem_ctx, "%d", v->v_sint8); + case CIM_UINT8: return talloc_asprintf(mem_ctx, "%u", v->v_uint8); + case CIM_SINT16: return talloc_asprintf(mem_ctx, "%d", v->v_sint16); + case CIM_UINT16: return talloc_asprintf(mem_ctx, "%u", v->v_uint16); + case CIM_SINT32: return talloc_asprintf(mem_ctx, "%d", v->v_sint32); + case CIM_UINT32: return talloc_asprintf(mem_ctx, "%u", v->v_uint32); + case CIM_SINT64: return talloc_asprintf(mem_ctx, "%lld", v->v_sint64); + case CIM_UINT64: return talloc_asprintf(mem_ctx, "%llu", v->v_sint64); + case CIM_REAL32: return talloc_asprintf(mem_ctx, "%f", (double)v->v_uint32); + case CIM_REAL64: return talloc_asprintf(mem_ctx, "%f", (double)v->v_uint64); + case CIM_BOOLEAN: return talloc_asprintf(mem_ctx, "%s", v->v_boolean?"True":"False"); + case CIM_STRING: + case CIM_DATETIME: + case CIM_REFERENCE: return talloc_asprintf(mem_ctx, "%s", v->v_string); + case CIM_CHAR16: return talloc_asprintf(mem_ctx, "Unsupported"); + case CIM_OBJECT: return talloc_asprintf(mem_ctx, "Unsupported"); + case CIM_ARR_SINT8: RETURN_CVAR_ARRAY_STR("%d", v->a_sint8); + case CIM_ARR_UINT8: RETURN_CVAR_ARRAY_STR("%u", v->a_uint8); + case CIM_ARR_SINT16: RETURN_CVAR_ARRAY_STR("%d", v->a_sint16); + case CIM_ARR_UINT16: RETURN_CVAR_ARRAY_STR("%u", v->a_uint16); + case CIM_ARR_SINT32: RETURN_CVAR_ARRAY_STR("%d", v->a_sint32); + case CIM_ARR_UINT32: RETURN_CVAR_ARRAY_STR("%u", v->a_uint32); + case CIM_ARR_SINT64: RETURN_CVAR_ARRAY_STR("%lld", v->a_sint64); + case CIM_ARR_UINT64: RETURN_CVAR_ARRAY_STR("%llu", v->a_uint64); + case CIM_ARR_REAL32: RETURN_CVAR_ARRAY_STR("%f", v->a_real32); + case CIM_ARR_REAL64: RETURN_CVAR_ARRAY_STR("%f", v->a_real64); + case CIM_ARR_BOOLEAN: RETURN_CVAR_ARRAY_STR("%d", v->a_boolean); + case CIM_ARR_STRING: RETURN_CVAR_ARRAY_STR("%s", v->a_string); + case CIM_ARR_DATETIME: RETURN_CVAR_ARRAY_STR("%s", v->a_datetime); + case CIM_ARR_REFERENCE: RETURN_CVAR_ARRAY_STR("%s", v->a_reference); default: return talloc_asprintf(mem_ctx, "Unsupported"); } } @@ -164,7 +164,7 @@ int main(int argc, char **argv) struct IEnumWbemClassObject *pEnum = NULL; struct com_context *ctx = NULL; - parse_args(argc, argv, &args); + parse_args(argc, argv, &args); wmi_init(&ctx, cmdline_credentials); diff --git a/source4/lib/wmi/tools/wmis.c b/source4/lib/wmi/tools/wmis.c index 2b7abbb7bc..314fdd1cd7 100644 --- a/source4/lib/wmi/tools/wmis.c +++ b/source4/lib/wmi/tools/wmis.c @@ -81,7 +81,7 @@ static void parse_args(int argc, char *argv[], struct program_args *pmyargs) } if (argc_new < 2 || argv_new[1][0] != '/' - || argv_new[1][1] != '/') { + || argv_new[1][1] != '/') { poptPrintUsage(pc, stdout, 0); poptFreeContext(pc); exit(1); @@ -119,7 +119,7 @@ WERROR WBEM_ConnectServer(struct com_context *ctx, const char *server, const cha } GUID_from_string(CLSID_WBEMLEVEL1LOGIN, &clsid); - GUID_from_string(COM_IWBEMLEVEL1LOGIN_UUID, &iid); + GUID_from_string(COM_IWBEMLEVEL1LOGIN_UUID, &iid); result = dcom_create_object(ctx, &clsid, server, 1, &iid, &mqi, &coresult); WERR_CHECK("dcom_create_object."); result = coresult; @@ -183,12 +183,12 @@ int main(int argc, char **argv) WERROR result; NTSTATUS status; struct IWbemServices *pWS = NULL; - struct IEnumWbemClassObject *pEnum = NULL; + struct IEnumWbemClassObject *pEnum = NULL; uint32_t cnt; struct BSTR queryLanguage; struct BSTR query; - parse_args(argc, argv, &args); + parse_args(argc, argv, &args); wmi_init(&ctx, cmdline_credentials); result = WBEM_ConnectServer(ctx, args.hostname, "root\\cimv2", 0, 0, 0, 0, 0, 0, &pWS); @@ -202,9 +202,9 @@ int main(int argc, char **argv) printf("3: Monitoring directory C:\\wmi_test_dir_tmp. Please create/delete files in that directory to see notifications, after 4 events program quits.\n"); query.data = "SELECT * FROM __InstanceOperationEvent WITHIN 1 WHERE Targetinstance ISA 'CIM_DirectoryContainsFile' and TargetInstance.GroupComponent= 'Win32_Directory.Name=\"C:\\\\\\\\wmi_test_dir_tmp\"'"; queryLanguage.data = "WQL"; - result = IWbemServices_ExecNotificationQuery(pWS, ctx, queryLanguage, + result = IWbemServices_ExecNotificationQuery(pWS, ctx, queryLanguage, query, WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY, NULL, &pEnum); - WERR_CHECK("WMI query execute."); + WERR_CHECK("WMI query execute."); for (cnt = 0; cnt < 4; ++cnt) { struct WbemClassObject *co; uint32_t ret; -- cgit