merge branch with fixes of bg #71

13 files changed, 109 insertions, 114 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);
 
 	
diff --git a/src/wsman.c b/src/wsman.c
index 7d38ebd..f613ad6 100644
--- a/src/wsman.c
+++ b/src/wsman.c
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
 	WsXmlDocH doc;
 	char *enumContext;
 	WsXmlDocH rqstDoc;
-	actionOptions options;
+	actionOptions *options;
 	WsXmlDocH enum_response;
 	WsXmlDocH resource;
 	char *enumeration_mode, *binding_enumeration_mode,
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
 
 	initialize_logging();
 	//      wsman_client_transport_init(NULL);
-	initialize_action_options(&options);
+	options = initialize_action_options();
 
 	debug("Certificate: %s", wsman_options_get_cafile());
 
@@ -152,35 +152,35 @@ int main(int argc, char **argv)
 	resource_uri_with_selectors = wsman_options_get_resource_uri();
 	if (resource_uri_with_selectors) {
 		wsman_set_options_from_uri(resource_uri_with_selectors,
-					   &options);
+					   options);
 		wsman_remove_query_string(resource_uri_with_selectors,
 					  &resource_uri);
 	}
 	op = wsman_options_get_action();
 
 	if (wsman_options_get_dump_request()) {
-		wsman_set_action_option(&options, FLAG_DUMP_REQUEST);
+		wsman_set_action_option(options, FLAG_DUMP_REQUEST);
 	}
 	if (wsman_options_get_max_envelope_size()) {
-		options.max_envelope_size =
+		options->max_envelope_size =
 		    wsman_options_get_max_envelope_size();
 	}
 	if (wsman_options_get_operation_timeout()) {
-		options.timeout = wsman_options_get_operation_timeout();
+		options->timeout = wsman_options_get_operation_timeout();
 	}
 	if (wsman_options_get_fragment()) {
-		options.fragment = wsman_options_get_fragment();
+		options->fragment = wsman_options_get_fragment();
 	}
 	if (wsman_options_get_filter()) {
-		options.filter = wsman_options_get_filter();
+		options->filter = wsman_options_get_filter();
 	}
 	if (wsman_options_get_dialect()) {
-		options.dialect = wsman_options_get_dialect();
+		options->dialect = wsman_options_get_dialect();
 	}
-	options.properties = wsman_options_get_properties();
-	options.cim_ns = wsman_options_get_cim_namespace();
+	options->properties = wsman_options_get_properties();
+	options->cim_ns = wsman_options_get_cim_namespace();
 	if (wsman_options_get_cim_ext()) {
-		wsman_set_action_option(&options, FLAG_CIM_EXTENSIONS);
+		wsman_set_action_option(options, FLAG_CIM_EXTENSIONS);
 	}
 
 
@@ -290,35 +290,35 @@ int main(int argc, char **argv)
 
 		if (enumeration_mode) {
 			if (strcmp(enumeration_mode, "epr") == 0)
-				wsman_set_action_option(&options,
+				wsman_set_action_option(options,
 							FLAG_ENUMERATION_ENUM_EPR);
 			else
-				wsman_set_action_option(&options,
+				wsman_set_action_option(options,
 							FLAG_ENUMERATION_ENUM_OBJ_AND_EPR);
 		}
 		if (binding_enumeration_mode) {
 			if (strcmp(binding_enumeration_mode, "include") ==
 			    0)
-				wsman_set_action_option(&options,
+				wsman_set_action_option(options,
 							FLAG_IncludeSubClassProperties);
 			else if (strcmp
 				 (binding_enumeration_mode,
 				  "exclude") == 0)
-				wsman_set_action_option(&options,
+				wsman_set_action_option(options,
 							FLAG_ExcludeSubClassProperties);
 			else if (strcmp(binding_enumeration_mode, "none")
 				 == 0)
-				wsman_set_action_option(&options,
+				wsman_set_action_option(options,
 							FLAG_POLYMORPHISM_NONE);
 		}
 		if (wsman_options_get_optimize_enum()) {
-			wsman_set_action_option(&options,
+			wsman_set_action_option(options,
 						FLAG_ENUMERATION_OPTIMIZATION);
 		}
-		options.max_elements = wsman_options_get_max_elements();
+		options->max_elements = wsman_options_get_max_elements();
 
 		if (wsman_options_get_estimate_enum()) {
-			wsman_set_action_option(&options,
+			wsman_set_action_option(options,
 						FLAG_ENUMERATION_COUNT_ESTIMATION);
 		}
 		enum_response = wsenum_enumerate(cl,
@@ -330,35 +330,32 @@ int main(int argc, char **argv)
 			      wsman_client_get_response_code(cl) == 500)) {
 				break;
 			}
-			enumContext =
-			    wsenum_get_enum_context(enum_response);
+			enumContext = wsenum_get_enum_context(enum_response);
 			ws_xml_destroy_doc(enum_response);
 		} else {
+			u_free(enumContext);
 			break;
 		}
 
-		if (!wsman_options_get_step_request()) {
-			while (enumContext != NULL && enumContext[0] != 0) {
-
-				doc =
-				    wsenum_pull(cl, resource_uri, options,
-						enumContext);
-				wsman_output(cl, doc);
-
-				if (wsman_client_get_response_code(cl) !=
-				    200
-				    && wsman_client_get_response_code(cl)
-				    != 400
-				    && wsman_client_get_response_code(cl)
-				    != 500) {
-					break;
-				}
-				enumContext = wsenum_get_enum_context(doc);
-				if (doc) {
-					ws_xml_destroy_doc(doc);
-				}
+		if (wsman_options_get_step_request())
+			break;
+		while (enumContext != NULL && enumContext[0] != 0) {
+
+			doc = wsenum_pull(cl, resource_uri, options,
+					enumContext);
+			wsman_output(cl, doc);
+
+			if (wsman_client_get_response_code(cl) != 200
+					&& wsman_client_get_response_code(cl) != 400
+					&& wsman_client_get_response_code(cl) != 500) {
+				break;
+			}
+			enumContext = wsenum_get_enum_context(doc);
+			if (doc) {
+				ws_xml_destroy_doc(doc);
 			}
 		}
+		u_free(enumContext);
 		break;
 	default:
 		fprintf(stderr, "Action not supported\n");
@@ -374,7 +371,7 @@ int main(int argc, char **argv)
 				wsman_client_get_fault_string(cl));
 		}
 	}
-	destroy_action_options(&options);
+	destroy_action_options(options);
 	wsman_release_client(cl);
 
 	wsman_client_transport_fini();
diff --git a/tests/cunit/enumeration.c b/tests/cunit/enumeration.c
index 6bc38fd..8d7a6b3 100644
--- a/tests/cunit/enumeration.c
+++ b/tests/cunit/enumeration.c
@@ -253,7 +253,7 @@ static int ntests = sizeof (tests) / sizeof (tests[0]);
 
 extern WsManClient *cl;
 
-actionOptions options;
+actionOptions *options;
 
 
 
@@ -265,17 +265,17 @@ static void enumeration_test() {
 
 
     reinit_client_connection(cl);
-    initialize_action_options(&options);
+    options = initialize_action_options();
 
-    options.flags = tests[i].flags;
+    options->flags = tests[i].flags;
 
     if (tests[i].selectors) {
         selectors =
               u_strdup_printf(tests[i].selectors, host, host, host);
-         wsman_add_selectors_from_query_string(&options, selectors);
+         wsman_add_selectors_from_query_string(options, selectors);
     }
 
-    options.max_elements = tests[i].max_elements;
+    options->max_elements = tests[i].max_elements;
     WsXmlDocH enum_response = wsenum_enumerate(cl,
                                 (char *)tests[i].resource_uri, options);
 
@@ -313,7 +313,7 @@ RETURN:
     if (enum_response) {
         ws_xml_destroy_doc(enum_response);
     }
-    destroy_action_options(&options);
+    destroy_action_options(options);
     i++; // decrease executed test number
 }
 
diff --git a/tests/cunit/identify.c b/tests/cunit/identify.c
index 39501f0..6b20131 100644
--- a/tests/cunit/identify.c
+++ b/tests/cunit/identify.c
@@ -88,7 +88,7 @@ static int ntests = sizeof (tests) / sizeof (tests[0]);
 
 
 extern WsManClient *cl;
-actionOptions options;
+actionOptions *options;
 
 
 
@@ -100,7 +100,7 @@ identify_test() {
     char *xp = NULL;
 
     reinit_client_connection(cl);
-    initialize_action_options(&options);
+    options = initialize_action_options();
 
     response = wsman_identify(cl, options);
     CU_ASSERT_TRUE(wsman_client_get_response_code(cl) == tests[i].final_status);
@@ -123,7 +123,7 @@ RETURN:
       ws_xml_destroy_doc(response);
     }
     u_free(xp);
-    destroy_action_options(&options);
+    destroy_action_options(options);
     i++;
 }
 
diff --git a/tests/cunit/invoke.c b/tests/cunit/invoke.c
index 69dac09..da41104 100755
--- a/tests/cunit/invoke.c
+++ b/tests/cunit/invoke.c
@@ -181,7 +181,7 @@ static int ntests = sizeof (invoke_tests) / sizeof (invoke_tests[0]);
 
 
 extern WsManClient *cl;
-actionOptions options;
+actionOptions *options;
 
 static void invoke_test() {
     WsXmlDocH doc;
@@ -191,7 +191,7 @@ static void invoke_test() {
     char *selectors = NULL;
 
 
-    initialize_action_options(&options);
+    options = initialize_action_options();
     if (invoke_tests[i].selectors) {
         selectors =
               u_strdup_printf(invoke_tests[i].selectors, host, host, host);
@@ -200,13 +200,13 @@ static void invoke_test() {
     reinit_client_connection(cl);
 
     if (selectors != NULL) {
-         wsman_add_selectors_from_query_string (&options, selectors);
+         wsman_add_selectors_from_query_string (options, selectors);
     }
     if (invoke_tests[i].properties != NULL) {
-       wsman_add_properties_from_query_string (&options,
+       wsman_add_properties_from_query_string (options,
                                         invoke_tests[i].properties);
     }
-    options.flags = invoke_tests[i].flags;
+    options->flags = invoke_tests[i].flags;
 
     doc = wsman_invoke(cl, (char *)invoke_tests[i].resource_uri, options,
                                 (char *)invoke_tests[i].method, NULL);
@@ -274,7 +274,7 @@ RETURN:
         ws_xml_destroy_doc(doc);
     }
     u_free(selectors);
-    destroy_action_options(&options);
+    destroy_action_options(options);
     i++; // increase executed test number
 }
 
diff --git a/tests/cunit/pull.c b/tests/cunit/pull.c
index 0144cdd..62e6a61 100644
--- a/tests/cunit/pull.c
+++ b/tests/cunit/pull.c
@@ -151,7 +151,7 @@ static int ntests = sizeof (pull_tests) / sizeof (pull_tests[0]);
 
 extern WsManClient *cl;
 
-actionOptions options;
+actionOptions *options;
 
 static void pull_test() {
     char *enumContext = NULL;
@@ -160,14 +160,14 @@ static void pull_test() {
     int num;
 
     reinit_client_connection(cl);
-    initialize_action_options(&options);
+    options = initialize_action_options();
 
-    options.flags = pull_tests[i].flags;
+    options->flags = pull_tests[i].flags;
 
     if (pull_tests[i].selectors != NULL)
-         wsman_add_selectors_from_query_string(&options, pull_tests[i].selectors);
+         wsman_add_selectors_from_query_string(options, pull_tests[i].selectors);
 
-    options.max_elements = pull_tests[i].max_elements;
+    options->max_elements = pull_tests[i].max_elements;
     WsXmlDocH enum_response = wsenum_enumerate(cl,
                                 (char *)pull_tests[i].resource_uri, options);
     CU_ASSERT_TRUE(wsman_client_get_response_code(cl) ==
@@ -234,7 +234,7 @@ RETURN:
         ws_xml_destroy_doc(enum_response);
     }
     u_free(xp);
-    destroy_action_options(&options);
+    destroy_action_options(options);
     i++; // decrease executed test number
 }
 
diff --git a/tests/cunit/transfer_get.c b/tests/cunit/transfer_get.c
index d6df91f..c6538f3 100644
--- a/tests/cunit/transfer_get.c
+++ b/tests/cunit/transfer_get.c
@@ -156,7 +156,7 @@ static int ntests = sizeof (get_tests) / sizeof (get_tests[0]);
 
 
 extern WsManClient *cl;
-actionOptions options;
+actionOptions *options;
 
 static void transfer_get_test() {
     WsXmlDocH doc;
@@ -172,10 +172,10 @@ static void transfer_get_test() {
     }
 
     reinit_client_connection(cl);
-    initialize_action_options(&options);
+    options = initialize_action_options();
 
     if (get_tests[i].selectors != NULL) {
-       wsman_add_selectors_from_query_string (&options, get_tests[i].selectors);
+       wsman_add_selectors_from_query_string (options, get_tests[i].selectors);
     }
 
 
@@ -229,7 +229,7 @@ RETURN:
     }
     u_free((char *)get_tests[i].selectors);
     get_tests[i].selectors = old_selectors;
-    destroy_action_options(&options);
+    destroy_action_options(options);
     i++; // increase executed test number
 }
 
diff --git a/tests/cunit/transfer_put.c b/tests/cunit/transfer_put.c
index 7c60d07..d90abb5 100755
--- a/tests/cunit/transfer_put.c
+++ b/tests/cunit/transfer_put.c
@@ -166,7 +166,7 @@ static int ntests = sizeof (put_tests) / sizeof (put_tests[0]);
 
 
 extern WsManClient *cl;
-actionOptions options;
+actionOptions *options;
 
 static void transfer_put_test() {
     WsXmlDocH doc;
@@ -181,16 +181,16 @@ static void transfer_put_test() {
               u_strdup_printf(put_tests[i].selectors, host, host, host);
     }
 
-    initialize_action_options(&options);
+    options = initialize_action_options();
 
     if (put_tests[i].selectors != NULL) {
-       wsman_add_selectors_from_query_string (&options, selectors);
+       wsman_add_selectors_from_query_string (options, selectors);
     }
     if (put_tests[i].properties != NULL) {
-       wsman_add_properties_from_query_string (&options,
+       wsman_add_properties_from_query_string (options,
                                                put_tests[i].properties);
     }
-    options.flags = put_tests[i].flags;
+    options->flags = put_tests[i].flags;
 
 
     doc = ws_transfer_get_and_put(cl, (char *)put_tests[i].resource_uri, options);
@@ -259,7 +259,7 @@ RETURN:
         ws_xml_destroy_doc(doc);
     }
     u_free(selectors);
-    destroy_action_options(&options);
+    destroy_action_options(options);
     i++; // increase executed test number
 }
 
diff --git a/tests/interop/interop.c b/tests/interop/interop.c
index b8584a9..b1e31ec 100644
--- a/tests/interop/interop.c
+++ b/tests/interop/interop.c
@@ -81,9 +81,8 @@ static int pull_items(WsManClient *cl, WsXmlDocH doc, void *data)
 static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest id)
 {
     WsXmlDocH response;
-    actionOptions options;
-    initialize_action_options(&options);
-    wsman_set_action_option(&options,FLAG_DUMP_REQUEST ); 
+    actionOptions *options = initialize_action_options();
+    wsman_set_action_option(options,FLAG_DUMP_REQUEST ); 
     if (id == 0) { // 6.1 Identify
         response = wsman_identify(cl, options);
         xml_parser_doc_dump(stdout, response);
@@ -91,7 +90,7 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i
 
         WsXmlNodeH input  = ws_xml_get_child(scenario, 0, NULL, "Input");
         WsXmlNodeH r  = ws_xml_get_child(input, 0, NULL, "ResourceURI");
-        wsman_add_selectors_list_from_node(input, &options);
+        wsman_add_selectors_list_from_node(input, options);
         char *resource_uri = ws_xml_get_node_text(r);
         response = ws_transfer_get(cl, resource_uri, options);
         xml_parser_doc_dump(stdout, response);
@@ -99,7 +98,7 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i
 
         WsXmlNodeH input  = ws_xml_get_child(scenario, 0, NULL, "Input");
         WsXmlNodeH r  = ws_xml_get_child(input, 0, NULL, "ResourceURI");
-        wsman_add_selectors_list_from_node(input, &options);
+        wsman_add_selectors_list_from_node(input, options);
         char *resource_uri = ws_xml_get_node_text(r);
         response = ws_transfer_get(cl, resource_uri, options);
         xml_parser_doc_dump(stdout, response);
@@ -107,7 +106,7 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i
 
         WsXmlNodeH input  = ws_xml_get_child(scenario, 0, NULL, "Input");
         WsXmlNodeH r  = ws_xml_get_child(input, 0, NULL, "ResourceURI");
-        wsman_add_selectors_list_from_node(input, &options);
+        wsman_add_selectors_list_from_node(input, options);
         char *resource_uri = ws_xml_get_node_text(r);
         response = ws_transfer_get(cl, resource_uri, options);
         xml_parser_doc_dump(stdout, response);
@@ -115,7 +114,7 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i
 
         WsXmlNodeH input  = ws_xml_get_child(scenario, 0, NULL, "Input");
         WsXmlNodeH r  = ws_xml_get_child(input, 0, NULL, "ResourceURI");
-        wsman_add_selectors_list_from_node(input, &options);
+        wsman_add_selectors_list_from_node(input, options);
         char *resource_uri = ws_xml_get_node_text(r);
         response = ws_transfer_get(cl, resource_uri, options);
         xml_parser_doc_dump(stdout, response);
@@ -127,7 +126,7 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i
         wsenum_enumerate_and_pull(cl, resource_uri , options, pull_items, NULL );
     }else if (id == 9) { // 7.2 Optimized Enumerate
 
-        wsman_set_action_option(&options, FLAG_ENUMERATION_OPTIMIZATION);
+        wsman_set_action_option(options, FLAG_ENUMERATION_OPTIMIZATION);
         WsXmlNodeH input  = ws_xml_get_child(scenario, 0, NULL, "Input");
         WsXmlNodeH r  = ws_xml_get_child(input, 0, NULL, "ResourceURI");
         char *resource_uri = ws_xml_get_node_text(r);
@@ -151,14 +150,14 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i
 
     }else if (id == 11) { // 7.4 Enumerate ObjectAndEPR
 
-        wsman_set_action_option(&options, FLAG_ENUMERATION_ENUM_EPR);
+        wsman_set_action_option(options, FLAG_ENUMERATION_ENUM_EPR);
         WsXmlNodeH input  = ws_xml_get_child(scenario, 0, NULL, "Input");
         WsXmlNodeH r  = ws_xml_get_child(input, 0, NULL, "ResourceURI");
         char *resource_uri = ws_xml_get_node_text(r);
         wsenum_enumerate_and_pull(cl, resource_uri , options, pull_items, NULL );
     }else if (id == 16) { // 7.9 Enumerate Polymorphism
 
-        wsman_set_action_option(&options, FLAG_POLYMORPHISM_NONE);
+        wsman_set_action_option(options, FLAG_POLYMORPHISM_NONE);
         WsXmlNodeH input  = ws_xml_get_child(scenario, 0, NULL, "Input");
         WsXmlNodeH r  = ws_xml_get_child(input, 0, NULL, "ResourceURI");
         char *resource_uri = ws_xml_get_node_text(r);
@@ -170,7 +169,7 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i
         WsXmlNodeH m  = ws_xml_get_child(input, 0, NULL, "MethodName");
         char *resource_uri = ws_xml_get_node_text(r);
         char *method = ws_xml_get_node_text(m);
-        wsman_add_selectors_list_from_node(input, &options);
+        wsman_add_selectors_list_from_node(input, options);
         response = wsman_invoke(cl, resource_uri, options, method, NULL);
         xml_parser_doc_dump(stdout, response);
     }else if (id == 18) { // 9.1 Put
@@ -181,8 +180,8 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i
         WsXmlNodeH v  = ws_xml_get_child(input, 0, NULL, "NewValue");
         printf("%s=%s\n", ws_xml_get_node_text(k), ws_xml_get_node_text(v) );
         char *resource_uri = ws_xml_get_node_text(r);
-        wsman_add_selectors_list_from_node(input, &options);
-        set_props(&options, ws_xml_get_node_text(k), ws_xml_get_node_text(v) );
+        wsman_add_selectors_list_from_node(input, options);
+        set_props(options, ws_xml_get_node_text(k), ws_xml_get_node_text(v) );
 
         response = ws_transfer_get_and_put(cl, resource_uri, options);
         xml_parser_doc_dump(stdout, response);
@@ -200,7 +199,7 @@ int main(int argc, char** argv)
     WsManClient *cl;
 
     WsXmlDocH doc;
-    actionOptions options;
+    actionOptions *options;
     char retval = 0;
     u_error_t *error = NULL;
 
@@ -248,7 +247,7 @@ int main(int argc, char** argv)
         uri->scheme,
         uri->user,
         uri->pwd);		
-    initialize_action_options(&options);
+    options = initialize_action_options();
 
     if (file == NULL) {
       fprintf(stderr, "Interop file required\n");