Removed second and third parameters of lasso_node_dump since @encoding is

always UTF-8 and @format is always to indent XML in lasso dumps.

12 files changed, 51 insertions, 65 deletions

diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index d63f7213..4f59111e 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -299,5 +299,5 @@ lasso_identity_dump(LassoIdentity *identity)
 	if (g_hash_table_size(identity->federations) == 0)
 		return g_strdup("");
 
-	return lasso_node_dump(LASSO_NODE(identity), NULL, 1);
+	return lasso_node_dump(LASSO_NODE(identity));
 }
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 5bdf5a4f..bb42f0fd 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -1454,7 +1454,7 @@ lasso_login_new_from_dump(LassoServer *server, const gchar *dump)
 gchar*
 lasso_login_dump(LassoLogin *login)
 {
-	return lasso_node_dump(LASSO_NODE(login), NULL, 1);
+	return lasso_node_dump(LASSO_NODE(login));
 }
 
 
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 5abbc740..74e852a7 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -1001,5 +1001,5 @@ lasso_logout_new_from_dump(LassoServer *server, const char *dump)
 gchar*
 lasso_logout_dump(LassoLogout *logout)
 {
-	return lasso_node_dump(LASSO_NODE(logout), NULL, 1);
+	return lasso_node_dump(LASSO_NODE(logout));
 }
diff --git a/lasso/id-ff/name_identifier_mapping.c b/lasso/id-ff/name_identifier_mapping.c
index cb9585bd..1fb3eb0f 100644
--- a/lasso/id-ff/name_identifier_mapping.c
+++ b/lasso/id-ff/name_identifier_mapping.c
@@ -462,6 +462,6 @@ char*
 lasso_name_identifier_mapping_dump(LassoNameIdentifierMapping *mapping)
 {
 	g_assert_not_reached();
-	return lasso_node_dump(LASSO_NODE(mapping), NULL, 1);
+	return lasso_node_dump(LASSO_NODE(mapping));
 }
 
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index 14f3950d..db0a53dd 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -659,5 +659,5 @@ lasso_name_registration_new_from_dump(LassoServer *server, const char *dump)
 gchar *
 lasso_name_registration_dump(LassoNameRegistration *name_registration)
 {
-	return lasso_node_dump(LASSO_NODE(name_registration), NULL, 1);
+	return lasso_node_dump(LASSO_NODE(name_registration));
 }
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index a65c2ec6..dec028bb 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -476,5 +476,5 @@ lasso_server_new_from_dump(const gchar *dump)
 gchar*
 lasso_server_dump(LassoServer *server)
 {
-	return lasso_node_dump(LASSO_NODE(server), NULL, 1);
+	return lasso_node_dump(LASSO_NODE(server));
 }
diff --git a/lasso/id-ff/service.c b/lasso/id-ff/service.c
index aa77efa5..b50ae122 100644
--- a/lasso/id-ff/service.c
+++ b/lasso/id-ff/service.c
@@ -32,7 +32,7 @@
 gchar*
 lasso_service_dump(LassoService *service)
 {
-	return lasso_node_dump(LASSO_NODE(service), NULL, 1);
+	return lasso_node_dump(LASSO_NODE(service));
 }
 
 void
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index f7cca3ff..9b1ba0e6 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -454,7 +454,7 @@ lasso_session_dump(LassoSession *session)
 	if (lasso_session_is_empty(session))
 		return g_strdup("");
 
-	return lasso_node_dump(LASSO_NODE(session), NULL, 1);
+	return lasso_node_dump(LASSO_NODE(session));
 }
 
 /**
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index 20363a24..6119af74 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -487,6 +487,6 @@ lasso_discovery_new_from_dump(LassoServer *server, const gchar *dump)
 gchar*
 lasso_discovery_dump(LassoDiscovery *discovery)
 {
-	return lasso_node_dump(LASSO_NODE(discovery), NULL, 1);
+	return lasso_node_dump(LASSO_NODE(discovery));
 }
 
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index b976988e..406debe5 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -60,9 +60,6 @@ static void xmlCleanNs(xmlNode *root_node);
 /**
  * lasso_node_dump:
  * @node: a #LassoNode
- * @encoding: the name of character set encoding to use or NULL for default
- *      (UTF-8).
- * @format: whether formatting is allowed
  * 
  * Dumps @node.  All datas in object are dumped in an XML format.
  * 
@@ -70,34 +67,24 @@ static void xmlCleanNs(xmlNode *root_node);
  *     caller.
  **/
 char*
-lasso_node_dump(LassoNode *node, const char *encoding, int format)
+lasso_node_dump(LassoNode *node)
 {
 	xmlNode *xmlnode;
 	char *ret;
-	xmlOutputBufferPtr buf;
-	xmlCharEncodingHandlerPtr handler = NULL;
+	xmlOutputBuffer *buf;
 
 	g_return_val_if_fail (LASSO_IS_NODE(node), NULL);
-	/* encoding is optional */
-	g_return_val_if_fail (format == 0 || format == 1, NULL);
 
-	if (encoding != NULL) {
-		handler = xmlFindCharEncodingHandler(encoding);
-		if (handler == NULL) {
-			return NULL;
-		}
-	}
-	buf = xmlAllocOutputBuffer(handler);
+	buf = xmlAllocOutputBuffer(NULL);
 	if (buf == NULL) {
 		return NULL;
 	}
 	xmlnode = lasso_node_get_xmlNode(node, TRUE);
-	xmlNodeDumpOutput(buf, NULL, xmlnode, 0, format, encoding);
+	xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 1, NULL);
 	xmlOutputBufferFlush(buf);
 	if (buf->conv != NULL) {
 		ret = g_strdup(buf->conv->content);
-	}
-	else {
+	} else {
 		ret = g_strdup(buf->buffer->content);
 	}
 	xmlOutputBufferClose(buf);
@@ -105,7 +92,6 @@ lasso_node_dump(LassoNode *node, const char *encoding, int format)
 	xmlFreeNode(xmlnode);
 
 	return ret;
-
 }
 
 /**
diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h
index b9c55bdb..a5b29d9c 100644
--- a/lasso/xml/xml.h
+++ b/lasso/xml/xml.h
@@ -100,7 +100,7 @@ LASSO_EXPORT LassoNode* lasso_node_new_from_soap(const char *soap);
 LASSO_EXPORT LassoNode* lasso_node_new_from_xmlNode(xmlNode* node);
 
 LASSO_EXPORT void lasso_node_destroy(LassoNode *node);
-LASSO_EXPORT char* lasso_node_dump(LassoNode *node, const char *encoding, int format);
+LASSO_EXPORT char* lasso_node_dump(LassoNode *node);
 LASSO_EXPORT char* lasso_node_export_to_base64(LassoNode *node);
 
 LASSO_EXPORT char* lasso_node_export_to_query(LassoNode *node,
diff --git a/swig/Lasso.i b/swig/Lasso.i
index 48a58d89..c33b30f7 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -712,7 +712,7 @@ typedef struct {
 	/* Methods */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -724,7 +724,7 @@ typedef struct {
 
 /* Methods implementations */
 
-#define LassoNode_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoNode_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -812,7 +812,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -824,7 +824,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoSamlAssertion_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoSamlAssertion_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -862,7 +862,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -874,7 +874,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoSamlNameIdentifier_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoSamlNameIdentifier_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -912,7 +912,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -924,7 +924,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoSamlpRequest_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoSamlpRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -958,7 +958,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -978,7 +978,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoSamlpResponse_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoSamlpResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1016,7 +1016,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1036,7 +1036,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoSamlpStatus_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoSamlpStatus_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1074,7 +1074,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1094,7 +1094,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoSamlpStatusCode_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoSamlpStatusCode_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1148,7 +1148,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1168,7 +1168,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoLibAssertion_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoLibAssertion_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1247,7 +1247,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1300,7 +1300,7 @@ void LassoLibAuthnRequest_Extension_set(LassoLibAuthnRequest *self, LassoStringA
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoLibAuthnRequest_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoLibAuthnRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1352,7 +1352,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1372,7 +1372,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoLibAuthnResponse_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoLibAuthnResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1424,7 +1424,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1444,7 +1444,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoLibFederationTerminationNotification_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoLibFederationTerminationNotification_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1506,7 +1506,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1526,7 +1526,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoLibLogoutRequest_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoLibLogoutRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1576,7 +1576,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1608,7 +1608,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoLibLogoutResponse_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoLibLogoutResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1671,7 +1671,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1703,7 +1703,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoLibRegisterNameIdentifierRequest_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoLibRegisterNameIdentifierRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1753,7 +1753,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1785,7 +1785,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoLibRegisterNameIdentifierResponse_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoLibRegisterNameIdentifierResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1833,7 +1833,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 }
 
 %{
@@ -1853,7 +1853,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoLibStatusResponse_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoLibStatusResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
@@ -1910,7 +1910,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 
 	/* Methods */
 
@@ -1949,7 +1949,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoProvider_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoProvider_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 /* Methods implementations */
 
@@ -2172,7 +2172,7 @@ typedef struct {
 	/* Methods inherited from LassoNode */
 
 	%newobject dump;
-	char *dump(char *encoding = NULL, int format = 1);
+	char *dump();
 
 	/* Methods */
 
@@ -2204,7 +2204,7 @@ typedef struct {
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoFederation_dump(self, encoding, format) lasso_node_dump(LASSO_NODE(self), encoding, format)
+#define LassoFederation_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 /* Methods implementations */