ID-FF 1.2: fix style fault

 * lasso/id-ff/defederation.c:
 * lasso/id-ff/logout.c:
 * lasso/id-ff/profile.c:
 * lasso/id-ff/provider.c:
 * lasso/id-ff/server.c:
   add missings casts, remove useless wrappers
 * lasso/id-ff/logout.c:
   In lasso_logout_process_request_msg change sequence of "if" for a
   "switch".

4 files changed, 21 insertions, 20 deletions

diff --git a/lasso/id-ff/defederation.c b/lasso/id-ff/defederation.c
index d083bb2d..b22cc210 100644
--- a/lasso/id-ff/defederation.c
+++ b/lasso/id-ff/defederation.c
@@ -215,7 +215,7 @@ lasso_defederation_init_notification(LassoDefederation *defederation, gchar *rem
 	if (federation->local_nameIdentifier) {
 		lasso_assign_gobject(profile->nameIdentifier, federation->local_nameIdentifier);
 	} else {
-		lasso_assign_gobject(profile->nameIdentifier, nameIdentifier);
+		lasso_assign_gobject(profile->nameIdentifier, LASSO_NODE(nameIdentifier));
 	}
 
 	/* get / verify http method */
@@ -334,8 +334,8 @@ lasso_defederation_process_notification_msg(LassoDefederation *defederation, cha
 	if (format == LASSO_MESSAGE_FORMAT_QUERY)
 		profile->http_request_method = LASSO_HTTP_METHOD_REDIRECT;
 
-	lasso_assign_gobject(profile->nameIdentifier, LASSO_LIB_FEDERATION_TERMINATION_NOTIFICATION(
-				profile->request)->NameIdentifier);
+	lasso_assign_gobject(profile->nameIdentifier, LASSO_NODE(LASSO_LIB_FEDERATION_TERMINATION_NOTIFICATION(
+				profile->request)->NameIdentifier));
 
 	/* get the RelayState (only available in redirect mode) */
 	if (LASSO_LIB_FEDERATION_TERMINATION_NOTIFICATION(profile->request)->RelayState)
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index b6e834ac..bed9dc78 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -564,13 +564,19 @@ lasso_logout_process_request_msg(LassoLogout *logout, char *request_msg)
 	profile->signature_status = lasso_provider_verify_signature(
 			remote_provider, request_msg, "RequestID", format);
 
-	if (format == LASSO_MESSAGE_FORMAT_SOAP)
-		profile->http_request_method = LASSO_HTTP_METHOD_SOAP;
-	if (format == LASSO_MESSAGE_FORMAT_QUERY)
-		profile->http_request_method = LASSO_HTTP_METHOD_REDIRECT;
+	switch (format) {
+		case LASSO_MESSAGE_FORMAT_SOAP:
+			profile->http_request_method = LASSO_HTTP_METHOD_SOAP;
+			break;
+		case LASSO_MESSAGE_FORMAT_QUERY:
+			profile->http_request_method = LASSO_HTTP_METHOD_REDIRECT;
+			break;
+		default:
+			return critical_error(LASSO_PROFILE_ERROR_INVALID_MSG);
+	}
 
 	lasso_assign_gobject(profile->nameIdentifier,
-			logout_request->NameIdentifier);
+			LASSO_NODE(logout_request->NameIdentifier));
 
 	return profile->signature_status;
 }
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index f369fa03..c4f9db96 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -512,15 +512,9 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 /*****************************************************************************/
 
 static void
-free_string(char *string)
-{
-	g_free(string);
-}
-
-static void
 free_list_strings(G_GNUC_UNUSED gchar *key, GList *list, G_GNUC_UNUSED gpointer data)
 {
-	g_list_foreach(list, (GFunc)free_string, NULL);
+	g_list_foreach(list, (GFunc)g_free, NULL);
 	g_list_free(list);
 }
 
@@ -839,8 +833,8 @@ lasso_provider_load_metadata_from_doc(LassoProvider *provider, xmlDoc *doc)
 
 	xpathObj = xmlXPathEvalExpression((xmlChar*)xpath_organization, xpathCtx);
 	if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeNr == 1) {
-		provider->private_data->organization = xmlCopyNode(
-				xpathObj->nodesetval->nodeTab[0], 1);
+		lasso_assign_xml_node(provider->private_data->organization,
+				xpathObj->nodesetval->nodeTab[0]);
 	}
 	xmlXPathFreeObject(xpathObj);
 
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 3260c167..4a14bfbd 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -47,6 +47,7 @@
 #endif
 
 #include "../utils.h"
+#include "../debug.h"
 
 /*****************************************************************************/
 /* public methods                                                            */
@@ -658,7 +659,7 @@ finalize(GObject *object)
 	g_free(server->private_key);
 	if (server->private_key_password) {
 		/* don't use memset() because it may be optimised away by
-		 * compiler (since the string is freeed just after */
+		 * compiler (since the string is freed just after */
 		while (server->private_key_password[i])
 			server->private_key_password[i++] = 0;
 		g_free(server->private_key_password);
@@ -683,7 +684,7 @@ instance_init(LassoServer *server)
 
 	server->providers = g_hash_table_new_full(
 			g_str_hash, g_str_equal, g_free,
-			(GDestroyNotify)lasso_node_destroy);
+			g_object_unref);
 
 	server->private_key = NULL;
 	server->private_key_password = NULL;
@@ -692,7 +693,7 @@ instance_init(LassoServer *server)
 
 	server->services = g_hash_table_new_full(g_str_hash, g_str_equal,
 			(GDestroyNotify)g_free,
-			(GDestroyNotify)lasso_node_destroy);
+			g_object_unref);
 }
 
 static void