merge branch with fixes of bg #71

5 files changed, 24 insertions, 25 deletions

diff --git a/examples/create_resource.c b/examples/create_resource.c
index 41aa6a2..c7d1f72 100644
--- a/examples/create_resource.c
+++ b/examples/create_resource.c
@@ -91,7 +91,7 @@ int main(int argc, char** argv)
 {
     WsManClient *cl;
     WsXmlDocH doc;
-    actionOptions options;
+    actionOptions *options;
     char retval = 0;
     u_error_t *error = NULL;
 
@@ -139,11 +139,11 @@ int main(int argc, char** argv)
         uri->scheme,
         uri->user,
         uri->pwd);		
-    initialize_action_options(&options);
+    options = initialize_action_options();
 
-    if (dump) wsman_set_action_option(&options,FLAG_DUMP_REQUEST );
-    options.max_envelope_size = 51200;
-    options.timeout = 60000;
+    if (dump) wsman_set_action_option(options,FLAG_DUMP_REQUEST );
+    options->max_envelope_size = 51200;
+    options->timeout = 60000;
 
     EXL_ExamplePolicy *d = u_malloc(sizeof(EXL_ExamplePolicy));
     d->ElementName = u_strdup("name");
@@ -168,7 +168,7 @@ int main(int argc, char** argv)
       u_uri_free(uri);
     }
 
-    destroy_action_options(&options);
+    destroy_action_options(options);
     wsman_release_client(cl);
     return 0;
 }
diff --git a/examples/enum_epr.c b/examples/enum_epr.c
index 21f3cbd..1659323 100644
--- a/examples/enum_epr.c
+++ b/examples/enum_epr.c
@@ -131,7 +131,7 @@ int main(int argc, char** argv)
 	
     WsManClient *cl;
     WsXmlDocH doc;
-    actionOptions options;
+    actionOptions *options;
     char retval = 0;
     u_error_t *error = NULL;
 
@@ -176,9 +176,9 @@ int main(int argc, char** argv)
         uri->scheme,
         uri->user,
         uri->pwd);		
-    initialize_action_options(&options);
+    options = initialize_action_options();
 
-    wsman_set_action_option(&options, FLAG_ENUMERATION_ENUM_EPR);
+    wsman_set_action_option(options, FLAG_ENUMERATION_ENUM_EPR);
     
 
     list_t *l = list_create(LISTCOUNT_T_MAX);
@@ -206,7 +206,7 @@ int main(int argc, char** argv)
       u_uri_free(uri);
     }
     
-    destroy_action_options(&options);
+    destroy_action_options(options);
     wsman_release_client(cl);
     return 0;
 }
diff --git a/examples/serialize.c b/examples/serialize.c
index fed4743..610288a 100644
--- a/examples/serialize.c
+++ b/examples/serialize.c
@@ -797,8 +797,7 @@ char *data = "<dummy><qq>This is qq body</qq><pp>This is pp</pp></dummy>";
         "wsman",
         "secret");
 
-      actionOptions   options;
-      initialize_action_options(&options);
+      actionOptions   *options = initialize_action_options();
 
       WsXmlDocH   request = wsman_client_create_request(cl,
                     "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem",
diff --git a/examples/win32_service.c b/examples/win32_service.c
index 6bbf491..476f828 100644
--- a/examples/win32_service.c
+++ b/examples/win32_service.c
@@ -183,7 +183,7 @@ int main(int argc, char** argv)
 {
 	WsManClient *cl;
 	WsXmlDocH doc;
-	actionOptions options;
+	actionOptions *options;
 	char retval = 0;
 	u_error_t *error = NULL;
 
@@ -240,28 +240,28 @@ int main(int argc, char** argv)
 			uri->scheme,
 			uri->user,
 			uri->pwd);		
-	initialize_action_options(&options);
+	options = initialize_action_options();
 
 	if (listall) {
-		if (dump) wsman_set_action_option(&options,FLAG_DUMP_REQUEST );
+		if (dump) wsman_set_action_option(options,FLAG_DUMP_REQUEST );
 		wsenum_enumerate_and_pull(cl, RESOURCE_URI, options, list_services, NULL );
 	} else if (start && argv[1]) {
-		if (dump) wsman_set_action_option(&options,FLAG_DUMP_REQUEST );
-		wsman_client_add_selector(&options, "Name", argv[1]);
+		if (dump) wsman_set_action_option(options,FLAG_DUMP_REQUEST );
+		wsman_client_add_selector(options, "Name", argv[1]);
 		doc = wsman_invoke(cl, RESOURCE_URI, options,
 				"StartService", NULL);
 		ws_xml_dump_node_tree(stdout, ws_xml_get_doc_root(doc));
 		ws_xml_destroy_doc(doc);
 	} else if (stop && argv[1]) {
-		if (dump) wsman_set_action_option(&options,FLAG_DUMP_REQUEST );
-		wsman_client_add_selector(&options, "Name", argv[1]);
+		if (dump) wsman_set_action_option(options,FLAG_DUMP_REQUEST );
+		wsman_client_add_selector(options, "Name", argv[1]);
 		doc = wsman_invoke(cl, RESOURCE_URI, options,
 				"StopService", NULL);
 		ws_xml_dump_node_tree(stdout, ws_xml_get_doc_root(doc));
 		ws_xml_destroy_doc(doc);
 	} else if ( argv[1] ) {
-		if (dump) wsman_set_action_option(&options,FLAG_DUMP_REQUEST );
-		wsman_client_add_selector(&options, "Name", argv[1]);
+		if (dump) wsman_set_action_option(options,FLAG_DUMP_REQUEST );
+		wsman_client_add_selector(options, "Name", argv[1]);
 		doc = ws_transfer_get(cl, RESOURCE_URI,
 				options);
 		if (doc) {
@@ -284,7 +284,7 @@ int main(int argc, char** argv)
 		u_uri_free(uri);
 	}
 
-	destroy_action_options(&options);
+	destroy_action_options(options);
 	wsman_release_client(cl);
 	return 0;
 }
diff --git a/examples/wsmid_identify.c b/examples/wsmid_identify.c
index 641d0f4..133d89b 100644
--- a/examples/wsmid_identify.c
+++ b/examples/wsmid_identify.c
@@ -66,7 +66,7 @@ int main(int argc, char** argv)
 	
     WsManClient *cl;
     WsXmlDocH doc;
-    actionOptions options;
+    actionOptions *options;
     char retval = 0;
     u_error_t *error = NULL;
 
@@ -123,7 +123,7 @@ fprintf( stderr, "wsman_create_client( host %s, port %d, path %s, scheme %s, use
         uri->scheme,
         uri->user,
         uri->pwd);
-    initialize_action_options(&options);
+    options = initialize_action_options();
 
 
     doc = wsman_identify(cl, options);
@@ -157,7 +157,7 @@ fprintf( stderr, "wsman_create_client( host %s, port %d, path %s, scheme %s, use
         ws_xml_destroy_doc(doc);
     }
 
-    destroy_action_options(&options);
+    destroy_action_options(options);
     wsman_release_client(cl);