open wsman

Free old string before assigning the new one.
---
 src/lib/wsman-client.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/lib/wsman-client.c b/src/lib/wsman-client.c
index c0a128b..fb683b7 100644
--- a/src/lib/wsman-client.c
+++ b/src/lib/wsman-client.c
@@ -1670,6 +1670,7 @@ wsmc_create_from_uri(const char* endpoint)
 int
 wsmc_set_encoding(WsManClient *cl, const char *encoding)
 {
+	u_free(cl->content_encoding);
 	cl->content_encoding = u_strdup(encoding);
 	return 0;
 }
@@ -1677,6 +1678,7 @@ wsmc_set_encoding(WsManClient *cl, const char *encoding)
 int
 wsmc_set_namespace(WsManClient *cl, const char *ns)
 {
+	u_free(cl->cim_ns);
 	cl->cim_ns = u_strdup(ns);
 	return 0;
 }
-- 
1.7.4.1

Perl defines die and warn macros, those conflict with the die
and warn macros defined by libu.

Undefine the Perl macros before including libu.h to avoid those
warnings.
---
 bindings/openwsman.i |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/bindings/openwsman.i b/bindings/openwsman.i
index 453ae00..4f7f8dc 100644
--- a/bindings/openwsman.i
+++ b/bindings/openwsman.i
@@ -117,6 +117,10 @@
 #if defined(SWIGPERL)
 /* filter_t is defined in Perls CORE/perl.h */
 #define filter_t filter_type
+
+/* undef Perl's die and warn macros as libu is going to reuse this names */
+#undef die
+#undef warn
 #endif
 
 #include <u/libu.h>
-- 
1.7.4.1

---
 src/lib/wsman-client-transport.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/lib/wsman-client-transport.c b/src/lib/wsman-client-transport.c
index 07a2c02..d80442a 100644
--- a/src/lib/wsman-client-transport.c
+++ b/src/lib/wsman-client-transport.c
@@ -162,18 +162,14 @@ char *wsman_transport_get_proxy(WsManClient *cl)
 
 void wsman_transport_set_userName(WsManClient * cl, char *arg)
 {
-	if (arg) {
-		u_free(cl->data.user);
-		cl->data.user = u_strdup(arg);
-	}
+	u_free(cl->data.user);
+	cl->data.user = arg ? u_strdup(arg) : NULL;
 }
 
 void wsman_transport_set_password(WsManClient * cl, char *arg)
 {
-	if (arg) {
-		u_free(cl->data.pwd);
-		cl->data.pwd = u_strdup(arg);
-	}
+	u_free(cl->data.pwd);
+	cl->data.pwd = arg ? u_strdup(arg) : NULL;
 }
 
 void wsman_transport_set_proxyauth(WsManClient * cl, const char *arg)
-- 
1.7.4.1

The test code might be seen as example code about how to use
the library. Therefore, make sure it doesn't leak memory.
---
 tests/client/test_associators.c    |    2 ++
 tests/client/test_pull.c           |    2 ++
 tests/client/test_references.c     |    2 ++
 tests/client/test_selectorfilter.c |    2 ++
 4 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/tests/client/test_associators.c b/tests/client/test_associators.c
index 499f133..b266323 100644
--- a/tests/client/test_associators.c
+++ b/tests/client/test_associators.c
@@ -108,10 +108,12 @@ int main(int argc, char** argv)
 		if (!doc) {
 			printf("\t\t\033[22;31mUNRESOLVED\033[m\n");
 			wsmc_options_destroy(options);
+			wsmc_free_enum_context(enumContext);
 			wsmc_release(cl);
 			return -1;
 		}
 		wsman_output(doc);
+		wsmc_free_enum_context(enumContext);
 		enumContext = wsmc_get_enum_context(doc);
 	}
 	if (doc)
diff --git a/tests/client/test_pull.c b/tests/client/test_pull.c
index 48f134d..b241a46 100644
--- a/tests/client/test_pull.c
+++ b/tests/client/test_pull.c
@@ -261,6 +261,7 @@ int main(int argc, char** argv)
                     u_free(xp);
 			    }
 		}
+		wsmc_free_enum_context(enumContext);
 		enumContext = wsmc_get_enum_context(enum_response);
 		ws_xml_destroy_doc(enum_response);
 
@@ -273,6 +274,7 @@ int main(int argc, char** argv)
                 goto CONTINUE;
             }
 			wsman_output(docp);
+			wsmc_free_enum_context(enumContext);
 			enumContext = wsmc_get_enum_context(docp);
 			ws_xml_destroy_doc(docp);
 		}
diff --git a/tests/client/test_references.c b/tests/client/test_references.c
index 62b9960..e27f2f9 100644
--- a/tests/client/test_references.c
+++ b/tests/client/test_references.c
@@ -112,10 +112,12 @@ int main(int argc, char** argv)
 		if (!doc) {
 			printf("\t\t\033[22;31mUNRESOLVED\033[m\n");
 			wsmc_options_destroy(options);
+			wsmc_free_enum_context(enumContext);
 			wsmc_release(cl);
 			return -1;
 		}
 		wsman_output(doc);
+		wsmc_free_enum_context(enumContext);
 		enumContext = wsmc_get_enum_context(doc);
 	}
 	if (doc)
diff --git a/tests/client/test_selectorfilter.c b/tests/client/test_selectorfilter.c
index afce13c..74666e4 100644
--- a/tests/client/test_selectorfilter.c
+++ b/tests/client/test_selectorfilter.c
@@ -115,10 +115,12 @@ int main(int argc, char** argv)
 		if (!doc) {
 			printf("\t\t\033[22;31mUNRESOLVED\033[m\n");
 			wsmc_options_destroy(options);
+			wsmc_free_enum_context(enumContext);
 			wsmc_release(cl);
 			return -1;
 		}
 		wsman_output(doc);
+		wsmc_free_enum_context(enumContext);
 		enumContext = wsmc_get_enum_context(doc);
 	}
 	if (doc)
-- 
1.7.4.1

---
 src/cpp/OpenWsmanClient.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cpp/OpenWsmanClient.cpp b/src/cpp/OpenWsmanClient.cpp
index 151a605..5e3e04e 100644
--- a/src/cpp/OpenWsmanClient.cpp
+++ b/src/cpp/OpenWsmanClient.cpp
@@ -181,11 +181,11 @@ void OpenWsmanClient::Enumerate(const string &resourceUri, vector<string> &enumR
 		string payload = ExtractItems(doc);
 		if (payload.length() > 0)
 			enumRes.push_back(payload);
-		u_free(enumContext);
+		wsmc_free_enum_context(enumContext);
 		enumContext = wsmc_get_enum_context(doc);    
 		ws_xml_destroy_doc(doc);
 	}
-	u_free(enumContext);
+	wsmc_free_enum_context(enumContext);
 	wsmc_options_destroy(options);
 }
 
@@ -239,11 +239,11 @@ void OpenWsmanClient::Enumerate(const string & resourceUri, WsmanFilter & filter
 		string payload = ExtractItems(doc);
 		if (payload.length() > 0)
 			enumRes.push_back(payload);
-		u_free(enumContext);
+		wsmc_free_enum_context(enumContext);
 		enumContext = wsmc_get_enum_context(doc);    
 		ws_xml_destroy_doc(doc);
 	}
-	u_free(enumContext);
+	wsmc_free_enum_context(enumContext);
 	wsmc_options_destroy(options);
 }
 
-- 
1.7.4.1

Matthias,

* Matthias Bolte <matthias.bolte@...> [Oct 31. 2011 20:48]:
> This patches can also be found in my clone on github.com in the fixes
> branch. This branch is different from the last fixes branch, I reused
> the name.
> 
> https://github.com/photron/openwsman/tree/fixes

thanks a lot. All patches were applied to master.

Regards,

Klaus
---
SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg)
Maxfeldstraße 5, 90409 Nürnberg, Germany