Remove unused code that is duplicated all over the place

5 files changed, 5 insertions, 13 deletions

diff --git a/examples/create_resource.c b/examples/create_resource.c
index b66f289..d44bc03 100644
--- a/examples/create_resource.c
+++ b/examples/create_resource.c
@@ -88,7 +88,6 @@ int main(int argc, char** argv)
     WsManClient *cl;
     WsXmlDocH doc;
     client_opt_t *options;
-    char retval = 0;
     u_error_t *error = NULL;
 
 
@@ -100,11 +99,10 @@ int main(int argc, char** argv)
     { NULL }
     };
 
-    u_option_context_t *opt_ctx;	
+    u_option_context_t *opt_ctx;
     opt_ctx = u_option_context_new("");
     u_option_context_set_ignore_unknown_options(opt_ctx, FALSE);
     u_option_context_add_main_entries(opt_ctx, opt, "Create Resource");
-    retval = u_option_context_parse(opt_ctx, &argc, &argv, &error);
 
     u_option_context_free(opt_ctx);
 
@@ -133,7 +131,7 @@ int main(int argc, char** argv)
         uri->path,
         uri->scheme,
         uri->user,
-        uri->pwd);		
+        uri->pwd);
     wsmc_transport_init(cl, NULL);
     options = wsmc_options_init();
 
diff --git a/examples/enum_epr.c b/examples/enum_epr.c
index 7b94942..b73d753 100644
--- a/examples/enum_epr.c
+++ b/examples/enum_epr.c
@@ -131,7 +131,6 @@ int main(int argc, char** argv)
 
     WsManClient *cl;
     client_opt_t *options;
-    char retval = 0;
     u_error_t *error = NULL;
 
 
@@ -145,7 +144,6 @@ int main(int argc, char** argv)
     opt_ctx = u_option_context_new("");
     u_option_context_set_ignore_unknown_options(opt_ctx, FALSE);
     u_option_context_add_main_entries(opt_ctx, opt, "Win32 Service");
-    retval = u_option_context_parse(opt_ctx, &argc, &argv, &error);
 
     u_option_context_free(opt_ctx);
 
diff --git a/examples/win32_service.c b/examples/win32_service.c
index 1280ec6..840a559 100644
--- a/examples/win32_service.c
+++ b/examples/win32_service.c
@@ -187,7 +187,6 @@ int main(int argc, char** argv)
 	WsManClient *cl;
 	WsXmlDocH doc;
 	client_opt_t *options;
-	char retval = 0;
 	u_error_t *error = NULL;
 
 
@@ -213,7 +212,6 @@ int main(int argc, char** argv)
 	opt_ctx = u_option_context_new("");
 	u_option_context_set_ignore_unknown_options(opt_ctx, FALSE);
 	u_option_context_add_main_entries(opt_ctx, opt, "Win32 Service");
-	retval = u_option_context_parse(opt_ctx, &argc, &argv, &error);
 
 	u_option_context_free(opt_ctx);
 
diff --git a/examples/wsmid_identify.c b/examples/wsmid_identify.c
index 094b082..b8016d1 100644
--- a/examples/wsmid_identify.c
+++ b/examples/wsmid_identify.c
@@ -76,7 +76,6 @@ int main(int argc, char** argv)
 	WsManClient *cl;
 	WsXmlDocH doc;
 	client_opt_t *options;
-	char retval = 0;
 	u_error_t *error = NULL;
 	WsSerializerContextH cntx = NULL;
 
@@ -98,7 +97,6 @@ int main(int argc, char** argv)
 	opt_ctx = u_option_context_new("");
 	u_option_context_set_ignore_unknown_options(opt_ctx, FALSE);
 	u_option_context_add_main_entries(opt_ctx, opt, "wsmid_identify");
-	retval = u_option_context_parse(opt_ctx, &argc, &argv, &error);
 
 	u_option_context_free(opt_ctx);
 
diff --git a/src/wsman.c b/src/wsman.c
index 7f40194..e30293a 100644
--- a/src/wsman.c
+++ b/src/wsman.c
@@ -333,12 +333,12 @@ static char wsman_parse_options(int argc, char **argv)
 	u_option_group_t *req_flag_group;
 
 	u_option_context_t *opt_ctx;
-	opt_ctx = u_option_context_new("<action> <Resource Uri>");
+	opt_ctx = u_option_context_new("<action> <resource URI>");
 	enum_group = u_option_group_new("enumeration", "Enumeration",
 			"Enumeration Options");
 	test_group = u_option_group_new("tests", "Tests", "Test Cases");
 	cim_group = u_option_group_new("cim", "CIM", "CIM Options");
-	event_group = u_option_group_new("event", "Event subscription", "Subscription Options");
+	event_group = u_option_group_new("event", "Event subscription", "Subscription options");
 	req_flag_group =
 		u_option_group_new("flags", "Flags", "Request Flags");
 
@@ -449,7 +449,7 @@ error1:
 
 /*
  * output pull results to separate files (appending "-<index>" to the name)
- * 
+ *
  */
 static void wsman_output_pull(WsManClient * cl, WsXmlDocH doc, int index)
 {