* Remove warnings:

 - remove unused parameter from private function signatures
 - remove unused variable
 - initialize variable potentially accessed uninitialized
 - add G_GNUC_UNUSED if function is public or adhering to an interface, and a
   parameter is unused.
 - if ID-WSF is not compiled in, define stubs with G_GNUC_UNUSED on parameters.
 The goal is to compile with -Werror.

44 files changed, 108 insertions, 226 deletions

diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index d1c4f567..9ef09322 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -289,7 +289,7 @@ lasso_identity_get_svc_md_ids(LassoIdentity *identity)
 static LassoNodeClass *parent_class = NULL;
 
 static void
-add_childnode_from_hashtable(gchar *key, LassoNode *value, xmlNode *xmlnode)
+add_childnode_from_hashtable(G_GNUC_UNUSED gchar *key, LassoNode *value, xmlNode *xmlnode)
 {
 	xmlAddChild(xmlnode, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE));
 }
@@ -303,7 +303,7 @@ add_text_childnode_from_list(gchar *value, xmlNode *xmlnode)
 #endif
 
 static xmlNode*
-get_xmlNode(LassoNode *node, gboolean lasso_dump)
+get_xmlNode(LassoNode *node, G_GNUC_UNUSED gboolean lasso_dump)
 {
 	xmlNode *xmlnode;
 	LassoIdentity *identity = LASSO_IDENTITY(node);
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index b94b8d50..4015ba1b 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -175,7 +175,9 @@
 #include <lasso/saml-2.0/loginprivate.h>
 
 
-static void lasso_login_assertion_add_discovery(LassoLogin *login, LassoSamlAssertion *assertion);
+#ifdef LASSO_WSF_ENABLED
+static void lasso_login_assertion_add_discovery(LassoLogin *login);
+#endif
 static void lasso_login_build_assertion_artifact(LassoLogin *login);
 
 /*****************************************************************************/
@@ -183,6 +185,7 @@ static void lasso_login_build_assertion_artifact(LassoLogin *login);
 /*****************************************************************************/
 
 
+#ifdef LASSO_WSF_ENABLED
 /**
  * lasso_login_assertion_add_discovery:
  * @login: a #LassoLogin
@@ -192,9 +195,8 @@ static void lasso_login_build_assertion_artifact(LassoLogin *login);
  * there is a discovery service.
  **/
 static void
-lasso_login_assertion_add_discovery(LassoLogin *login, LassoSamlAssertion *assertion)
+lasso_login_assertion_add_discovery(LassoLogin *login)
 {
-#ifdef LASSO_WSF_ENABLED
 	LassoProfile *profile = LASSO_PROFILE(login);
 	LassoDiscoResourceOffering *resourceOffering;
 	LassoDiscoServiceInstance *serviceInstance, *newServiceInstance;
@@ -227,8 +229,8 @@ lasso_login_assertion_add_discovery(LassoLogin *login, LassoSamlAssertion *asser
 
 		/* FIXME: Add CredentialsRef and saml:Advice Assertions */
 	}
-#endif
 }
+#endif
 
 
 /**
@@ -236,8 +238,6 @@ lasso_login_assertion_add_discovery(LassoLogin *login, LassoSamlAssertion *asser
  * @login: a #LassoLogin
  * @authenticationMethod: the authentication method
  * @authenticationInstant: the time at which the authentication took place
- * @reauthenticateOnOrAfter: the time at, or after which the service provider
- *     must reauthenticates the principal with the identity provider
  * @notBefore: the earliest time instant at which the assertion is valid
  * @notOnOrAfter: the time instant at which the assertion has expired
  * 
@@ -275,7 +275,7 @@ lasso_login_build_assertion(LassoLogin *login,
 	IF_SAML2(profile) {
 		return lasso_saml20_login_build_assertion(login,
 				authenticationMethod, authenticationInstant,
-				reauthenticateOnOrAfter, notBefore, notOnOrAfter);
+				notBefore, notOnOrAfter);
 	}
 
 	federation = g_hash_table_lookup(profile->identity->federations,
@@ -339,7 +339,9 @@ lasso_login_build_assertion(LassoLogin *login,
 				g_object_ref(assertion));
 	}
 
-	lasso_login_assertion_add_discovery(login, assertion);
+#ifdef LASSO_WSF_ENABLED
+	lasso_login_assertion_add_discovery(login);
+#endif
 
 	/* store assertion in session object */
 	if (profile->session == NULL) {
@@ -1180,7 +1182,7 @@ lasso_login_build_response_msg(LassoLogin *login, gchar *remote_providerID)
 	lasso_profile_clean_msg_info(profile);
 
 	IF_SAML2(profile) {
-		return lasso_saml20_login_build_response_msg(login, remote_providerID);
+		return lasso_saml20_login_build_response_msg(login);
 	}
 
 	profile->response = lasso_samlp_response_new();
@@ -1320,7 +1322,7 @@ lasso_login_init_authn_request(LassoLogin *login, const gchar *remote_providerID
 		return critical_error(LASSO_SERVER_ERROR_PROVIDER_NOT_FOUND);
 
 	IF_SAML2(profile) {
-		return lasso_saml20_login_init_authn_request(login, remote_provider, http_method);
+		return lasso_saml20_login_init_authn_request(login, http_method);
 	}
 
 	if (http_method != LASSO_HTTP_METHOD_REDIRECT && http_method != LASSO_HTTP_METHOD_POST) {
@@ -1912,6 +1914,7 @@ lasso_login_process_response_msg(LassoLogin *login, gchar *response_msg)
 }
 
 
+#ifdef LASSO_WSF_ENABLED
 /**
  * lasso_login_set_encryptedResourceId:
  * @login: a #LassoLogin
@@ -1925,18 +1928,18 @@ int
 lasso_login_set_encryptedResourceId(LassoLogin *login,
 		LassoDiscoEncryptedResourceID *encryptedResourceId)
 {
-#ifdef LASSO_WSF_ENABLED
 	g_return_val_if_fail(LASSO_IS_LOGIN(login), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 	g_return_val_if_fail(LASSO_IS_DISCO_ENCRYPTED_RESOURCE_ID(encryptedResourceId),
 			LASSO_PARAM_ERROR_INVALID_VALUE);
 
 	login->private_data->encryptedResourceId = g_object_ref(encryptedResourceId);
-#endif
 
 	return 0;
 }
+#endif
 
 
+#ifdef LASSO_WSF_ENABLED
 /**
  * lasso_login_set_resourceId:
  * @login: a #LassoLogin
@@ -1949,14 +1952,19 @@ lasso_login_set_encryptedResourceId(LassoLogin *login,
 int
 lasso_login_set_resourceId(LassoLogin *login, const char *content)
 {
-#ifdef LASSO_WSF_ENABLED
 	g_return_val_if_fail(LASSO_IS_LOGIN(login), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 	g_return_val_if_fail(content != NULL, LASSO_PARAM_ERROR_INVALID_VALUE);
 
 	login->private_data->resourceId = lasso_disco_resource_id_new(content);
-#endif
 	return 0;
 }
+#else
+int
+lasso_login_set_resourceId(G_GNUC_UNUSED LassoLogin *login, G_GNUC_UNUSED const char *content)
+{
+	return LASSO_ERROR_UNIMPLEMENTED;
+}
+#endif
 
 /*****************************************************************************/
 /* private methods                                                           */
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 83dd87b3..b4fe204d 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -984,7 +984,7 @@ static struct XmlSnippet schema_snippets[] = {
 static LassoNodeClass *parent_class = NULL;
 
 static void
-check_soap_support(gchar *key, LassoProvider *provider, LassoProfile *profile)
+check_soap_support(G_GNUC_UNUSED gchar *key, LassoProvider *provider, LassoProfile *profile)
 {
 	GList *supported_profiles;
 	LassoSamlAssertion *assertion;
diff --git a/lasso/id-ff/name_identifier_mapping.c b/lasso/id-ff/name_identifier_mapping.c
index 3adadeab..74c9879f 100644
--- a/lasso/id-ff/name_identifier_mapping.c
+++ b/lasso/id-ff/name_identifier_mapping.c
@@ -533,16 +533,6 @@ lasso_name_identifier_mapping_validate_request(LassoNameIdentifierMapping *mappi
 /* instance and class init functions                                         */
 /*****************************************************************************/
 
-static void
-instance_init(LassoNameIdentifierMapping *name_identifier_mapping)
-{
-}
-
-static void
-class_init(LassoNameIdentifierMappingClass *klass)
-{
-}
-
 GType
 lasso_name_identifier_mapping_get_type()
 {
@@ -553,12 +543,12 @@ lasso_name_identifier_mapping_get_type()
 			sizeof (LassoNameIdentifierMappingClass),
 			NULL,
 			NULL,
-			(GClassInitFunc) class_init,
+			NULL,
 			NULL,
 			NULL,
 			sizeof(LassoNameIdentifierMapping),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index 383c348f..dbfae69a 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -513,7 +513,7 @@ free_string(char *string)
 }
 
 static void
-free_list_strings(gchar *key, GList *list, gpointer data)
+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_free(list);
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 743d2dc8..9d63261c 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -123,6 +123,7 @@ lasso_server_add_provider_from_buffer(LassoServer *server, LassoProviderRole rol
 			public_key, ca_cert_chain, lasso_provider_new_from_buffer);
 }
 
+#ifdef LASSO_WSF_ENABLED
 /**
  * lasso_server_add_service:
  * @server: a #LassoServer
@@ -135,7 +136,6 @@ lasso_server_add_provider_from_buffer(LassoServer *server, LassoProviderRole rol
 gint
 lasso_server_add_service(LassoServer *server, LassoNode *service)
 {
-#ifdef LASSO_WSF_ENABLED
 	g_return_val_if_fail(LASSO_IS_SERVER(server), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 	g_return_val_if_fail(service != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 
@@ -149,9 +149,15 @@ lasso_server_add_service(LassoServer *server, LassoNode *service)
 	} else {
 		return LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ;
 	}
-#endif
 	return 0;
 }
+#else
+gint
+lasso_server_add_service(G_GNUC_UNUSED LassoServer *server, G_GNUC_UNUSED LassoNode *service)
+{
+	return LASSO_ERROR_UNIMPLEMENTED;
+}
+#endif
 
 
 /**
@@ -322,7 +328,7 @@ lasso_server_load_affiliation(LassoServer *server, const gchar *filename)
 	}
 
 	if (provider->private_data->conformance == LASSO_PROTOCOL_SAML_2_0) {
-		rc = lasso_saml20_server_load_affiliation(server, doc, node);
+		rc = lasso_saml20_server_load_affiliation(server, node);
 	} else {
 		/* affiliations are not supported in ID-FF 1.2 mode */
 		rc = LASSO_ERROR_UNIMPLEMENTED;
@@ -348,7 +354,7 @@ static struct XmlSnippet schema_snippets[] = {
 static LassoNodeClass *parent_class = NULL;
 
 static void
-add_provider_childnode(gchar *key, LassoProvider *value, xmlNode *xmlnode)
+add_provider_childnode(G_GNUC_UNUSED gchar *key, LassoProvider *value, xmlNode *xmlnode)
 {
 	xmlAddChild(xmlnode, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE));
 }
@@ -503,7 +509,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 
 
 static gboolean
-get_first_providerID(gchar *key, gpointer value, char **providerID)
+get_first_providerID(gchar *key, G_GNUC_UNUSED gpointer value, char **providerID)
 {
 	*providerID = key;
 	return TRUE;
@@ -564,7 +570,7 @@ lasso_server_get_service(LassoServer *server, const gchar *serviceType)
 
 
 static gboolean
-get_providerID_with_hash(gchar *key, gpointer value, char **providerID)
+get_providerID_with_hash(gchar *key, G_GNUC_UNUSED gpointer value, char **providerID)
 {
 	char *hash = *providerID;
 	xmlChar *hash_providerID;
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index 83bd55ca..98c54e43 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -199,7 +199,7 @@ lasso_session_get_assertion_by_id(LassoSession *session, const gchar *assertionI
 }
 
 static void
-add_assertion_to_list(gchar *key, LassoLibAssertion *value, GList **list)
+add_assertion_to_list(G_GNUC_UNUSED gchar *key, LassoLibAssertion *value, GList **list)
 {
 	*list = g_list_append(*list, value);
 }
@@ -255,7 +255,7 @@ lasso_session_get_status(LassoSession *session, const gchar *providerID)
 }
 
 static void
-add_providerID(gchar *key, LassoLibAssertion *assertion, LassoSession *session)
+add_providerID(gchar *key, G_GNUC_UNUSED LassoLibAssertion *assertion, LassoSession *session)
 {
 	session->private_data->providerIDs = g_list_append(
 			session->private_data->providerIDs, key);
@@ -556,7 +556,7 @@ add_childnode_from_hashtable(gchar *key, LassoNode *value, struct DumpContext *c
 #endif
 
 static xmlNode*
-get_xmlNode(LassoNode *node, gboolean lasso_dump)
+get_xmlNode(LassoNode *node, G_GNUC_UNUSED gboolean lasso_dump)
 {
 	xmlNode *xmlnode;
 	LassoSession *session = LASSO_SESSION(node);
diff --git a/lasso/id-wsf-2.0/data_service.c b/lasso/id-wsf-2.0/data_service.c
index 468389b2..8809696f 100644
--- a/lasso/id-wsf-2.0/data_service.c
+++ b/lasso/id-wsf-2.0/data_service.c
@@ -298,8 +298,7 @@ lasso_idwsf2_data_service_parse_query_items(LassoIdWsf2DataService *service)
 }
 
 static gint
-lasso_idwsf2_data_service_process_query_response_soap_fault_msg(LassoIdWsf2DataService *service,
-	const gchar *message)
+lasso_idwsf2_data_service_process_query_response_soap_fault_msg(LassoIdWsf2DataService *service)
 {
 	LassoIdWsf2Profile *profile = LASSO_IDWSF2_PROFILE(service);
 	LassoSoapFault *fault;
@@ -357,7 +356,7 @@ lasso_idwsf2_data_service_process_query_response_msg(LassoIdWsf2DataService *ser
 	/* Message can be either a SoapFault or a QueryResponse */
 	if (LASSO_IS_SOAP_FAULT(LASSO_PROFILE(profile)->response)) {
 		return lasso_idwsf2_data_service_process_query_response_soap_fault_msg(
-			service, message);
+			service);
 	}
 
 	if (! LASSO_IS_IDWSF2_DSTREF_QUERY_RESPONSE(LASSO_PROFILE(profile)->response)) {
@@ -680,8 +679,8 @@ lasso_idwsf2_data_service_process_modify_msg(LassoIdWsf2DataService *service, co
 }
 
 static gint
-lasso_idwsf2_data_service_parse_one_modify_item(LassoIdWsf2DstRefModifyItem *item,
-	LassoIdWsf2DstRefModifyResponse *response, xmlDoc *cur_doc, xmlXPathContext *cur_xpathCtx)
+lasso_idwsf2_data_service_parse_one_modify_item(LassoIdWsf2DstRefModifyItem *item, xmlDoc *cur_doc,
+		xmlXPathContext *cur_xpathCtx)
 {
 	xmlXPathObject *cur_xpathObj;
 	xmlNode *new_node;
@@ -787,7 +786,7 @@ lasso_idwsf2_data_service_parse_modify_items(LassoIdWsf2DataService *service)
 	for (iter = g_list_first(request->ModifyItem); iter != NULL; iter = g_list_next(iter)) {
 		item = iter->data;
 		res = lasso_idwsf2_data_service_parse_one_modify_item(
-			item, response, cur_doc, cur_xpathCtx);
+			item, cur_doc, cur_xpathCtx);
 		if (res != 0) {
 			/* If one item fails, stop and roll back */
 			break;
diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c
index 76373374..62c3b165 100644
--- a/lasso/id-wsf-2.0/discovery.c
+++ b/lasso/id-wsf-2.0/discovery.c
@@ -417,8 +417,9 @@ lasso_idwsf2_discovery_process_metadata_association_add_response_msg(
  * Return value: 0 on success; or a negative value otherwise.
  **/
 gint
-lasso_idwsf2_discovery_init_query(LassoIdWsf2Discovery *discovery, const gchar *security_mech_id)
+lasso_idwsf2_discovery_init_query(LassoIdWsf2Discovery *discovery, G_GNUC_UNUSED const gchar *security_mech_id)
 {
+	/* FIXME: add support of security mechanims */
 	LassoIdWsf2Profile *profile = LASSO_IDWSF2_PROFILE(discovery);
 	LassoSession *session = LASSO_PROFILE(profile)->session;
 	LassoWsAddrEndpointReference *epr;
@@ -731,8 +732,9 @@ lasso_idwsf2_discovery_process_query_response_msg(LassoIdWsf2Discovery *discover
  *     error occured.
  **/
 LassoIdWsf2DataService*
-lasso_idwsf2_discovery_get_service(LassoIdWsf2Discovery *discovery, const gchar *service_type)
+lasso_idwsf2_discovery_get_service(LassoIdWsf2Discovery *discovery, G_GNUC_UNUSED const gchar *service_type)
 {
+	/* FIXME: service_type is unused, should we remove it from public API ? */
 	LassoIdWsf2Profile *profile = LASSO_IDWSF2_PROFILE(discovery);
 	LassoIdWsf2DiscoQueryResponse *response;
 	LassoWsAddrEndpointReference *epr = NULL;
diff --git a/lasso/id-wsf-2.0/profile.c b/lasso/id-wsf-2.0/profile.c
index eb376a11..31800dfe 100644
--- a/lasso/id-wsf-2.0/profile.c
+++ b/lasso/id-wsf-2.0/profile.c
@@ -52,8 +52,9 @@
 /*****************************************************************************/
 
 static LassoSoapEnvelope*
-lasso_idwsf2_profile_build_soap_envelope(const char *refToMessageId, const char *providerId)
+lasso_idwsf2_profile_build_soap_envelope(G_GNUC_UNUSED const char *refToMessageId, G_GNUC_UNUSED const char *providerId)
 {
+	/* FIXME: add support for sb:Correlation header, and refToMessageId parameter */
 	LassoSoapEnvelope *envelope;
 	LassoSoapHeader *header;
 	LassoSoapBody *body;
@@ -128,7 +129,7 @@ gint
 lasso_idwsf2_profile_process_soap_request_msg(LassoIdWsf2Profile *profile, const gchar *message)
 {
 	LassoSoapEnvelope *envelope = NULL;
-	LassoSaml2Assertion *assertion;
+	LassoSaml2Assertion *assertion = NULL;
 	LassoWsSec1SecurityHeader *wsse_security;
 	LassoSaml2EncryptedElement *encrypted_id = NULL;
 	LassoNode *decrypted_name_id = NULL;
diff --git a/lasso/saml-2.0/login.c b/lasso/saml-2.0/login.c
index a71df97f..a60329b8 100644
--- a/lasso/saml-2.0/login.c
+++ b/lasso/saml-2.0/login.c
@@ -70,8 +70,7 @@ static char* lasso_saml20_login_get_assertion_consumer_service_url(LassoLogin *l
 		LassoProvider *remote_provider);
 
 gint
-lasso_saml20_login_init_authn_request(LassoLogin *login, LassoProvider *remote_provider,
-		LassoHttpMethod http_method)
+lasso_saml20_login_init_authn_request(LassoLogin *login, LassoHttpMethod http_method)
 {
 	LassoProfile *profile = LASSO_PROFILE(login);
 	LassoSamlp2RequestAbstract *request;
@@ -618,10 +617,10 @@ lasso_saml20_login_process_federation(LassoLogin *login, gboolean is_consent_obt
 }
 
 
+#ifdef LASSO_WSF_ENABLED
 static void
 lasso_saml20_login_assertion_add_discovery(LassoLogin *login, LassoSaml2Assertion *assertion)
 {
-#ifdef LASSO_WSF_ENABLED
 	GList *svcMDIDs;
 	GList *svcMDs;
 	LassoIdWsf2DiscoSvcMetadata *svcMD;
@@ -727,14 +726,18 @@ lasso_saml20_login_assertion_add_discovery(LassoLogin *login, LassoSaml2Assertio
 	/* Free resources */
 	g_list_foreach(svcMDs, (GFunc)lasso_node_destroy, NULL);
 	g_list_free(svcMDs);
-#endif
 }
+#else
+static void
+lasso_saml20_login_assertion_add_discovery(G_GNUC_UNUSED LassoLogin *login, G_GNUC_UNUSED LassoSaml2Assertion *assertion)
+{
+}
+#endif
 
 int
 lasso_saml20_login_build_assertion(LassoLogin *login,
 		const char *authenticationMethod,
 		const char *authenticationInstant,
-		const char *reauthenticateOnOrAfter,
 		const char *notBefore,
 		const char *notOnOrAfter)
 {
@@ -1010,7 +1013,7 @@ lasso_saml20_login_process_request_msg(LassoLogin *login, gchar *request_msg)
 }
 
 gint
-lasso_saml20_login_build_response_msg(LassoLogin *login, gchar *remote_providerID)
+lasso_saml20_login_build_response_msg(LassoLogin *login)
 {
 	LassoProfile *profile = LASSO_PROFILE(login);
 	LassoProvider *remote_provider;
@@ -1288,10 +1291,10 @@ lasso_saml20_login_process_response_status_and_assertion(LassoLogin *login)
 	return ret;
 }
 
+#ifdef LASSO_WSF_ENABLED
 static gint
 lasso_saml20_login_copy_assertion_epr(LassoLogin *login)
 {
-#ifdef LASSO_WSF_ENABLED
 	LassoProfile *profile = LASSO_PROFILE(login);
 	LassoSession *session = profile->session;
 	LassoSaml2Assertion *assertion;
@@ -1339,10 +1342,16 @@ lasso_saml20_login_copy_assertion_epr(LassoLogin *login)
 			}
 		}
 	}
-#endif
 
 	return 0;
 }
+#else
+static gint
+lasso_saml20_login_copy_assertion_epr(G_GNUC_UNUSED LassoLogin *login)
+{
+	return LASSO_ERROR_UNIMPLEMENTED;
+}
+#endif
 
 gint
 lasso_saml20_login_accept_sso(LassoLogin *login)
diff --git a/lasso/saml-2.0/loginprivate.h b/lasso/saml-2.0/loginprivate.h
index adb2fe01..673fd5d1 100644
--- a/lasso/saml-2.0/loginprivate.h
+++ b/lasso/saml-2.0/loginprivate.h
@@ -31,8 +31,7 @@ extern "C" {
 
 #include <lasso/id-ff/login.h>
 
-gint lasso_saml20_login_init_authn_request(LassoLogin *login, LassoProvider *remote_provider,
-		LassoHttpMethod http_method);
+gint lasso_saml20_login_init_authn_request(LassoLogin *login, LassoHttpMethod http_method);
 gint lasso_saml20_login_build_authn_request_msg(LassoLogin *login, LassoProvider *remote_provider);
 gint lasso_saml20_login_build_authn_response_msg(LassoLogin *login);
 gint lasso_saml20_login_process_authn_request_msg(LassoLogin *login, const char *authn_request_msg);
@@ -42,14 +41,13 @@ int lasso_saml20_login_validate_request_msg(LassoLogin *login, gboolean authenti
 		gboolean is_consent_obtained);
 int lasso_saml20_login_build_assertion(LassoLogin *login,
 		const char *authenticationMethod, const char *authenticationInstant,
-		const char *reauthenticateOnOrAfter, const char *notBefore,
-		const char *notOnOrAfter);
+		const char *notBefore, const char *notOnOrAfter);
 gint lasso_saml20_login_build_artifact_msg(LassoLogin *login, LassoHttpMethod http_method);
 gint lasso_saml20_login_init_request(LassoLogin *login, gchar *response_msg,
 		LassoHttpMethod response_http_method);
 gint lasso_saml20_login_build_request_msg(LassoLogin *login);
 gint lasso_saml20_login_process_request_msg(LassoLogin *login, gchar *request_msg);
-gint lasso_saml20_login_build_response_msg(LassoLogin *login, gchar *remote_providerID);
+gint lasso_saml20_login_build_response_msg(LassoLogin *login);
 gint lasso_saml20_login_process_response_msg(LassoLogin *login, gchar *response_msg);
 gint lasso_saml20_login_process_authn_response_msg(LassoLogin *login, gchar *authn_response_msg);
 gint lasso_saml20_login_accept_sso(LassoLogin *login);
diff --git a/lasso/saml-2.0/logout.c b/lasso/saml-2.0/logout.c
index 2b50b891..fd16b5a7 100644
--- a/lasso/saml-2.0/logout.c
+++ b/lasso/saml-2.0/logout.c
@@ -474,7 +474,7 @@ lasso_saml20_logout_validate_request(LassoLogout *logout)
 }
 
 static void
-check_soap_support(gchar *key, LassoProvider *provider, LassoProfile *profile)
+check_soap_support(G_GNUC_UNUSED gchar *key, LassoProvider *provider, LassoProfile *profile)
 {
 	GList *supported_profiles;
 	LassoSaml2Assertion *assertion;
diff --git a/lasso/saml-2.0/name_id_management.c b/lasso/saml-2.0/name_id_management.c
index 8779ca3f..ae86c0ac 100644
--- a/lasso/saml-2.0/name_id_management.c
+++ b/lasso/saml-2.0/name_id_management.c
@@ -702,11 +702,6 @@ finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoNameIdManagement *name_id_management)
-{
-}
-
-static void
 class_init(LassoNameIdManagementClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -737,7 +732,7 @@ lasso_name_id_management_get_type()
 			NULL, NULL,
 			sizeof(LassoNameIdManagement),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/saml-2.0/profile.c b/lasso/saml-2.0/profile.c
index 930ab40d..70394581 100644
--- a/lasso/saml-2.0/profile.c
+++ b/lasso/saml-2.0/profile.c
@@ -329,7 +329,7 @@ lasso_profile_is_saml_query(const gchar *query)
 
 static void
 lasso_saml20_profile_set_session_from_dump_decrypt(
-		gpointer key, LassoSaml2Assertion *assertion, gpointer data)
+		G_GNUC_UNUSED gpointer key, LassoSaml2Assertion *assertion, G_GNUC_UNUSED gpointer data)
 {
 	if (LASSO_IS_SAML2_ASSERTION(assertion) == FALSE) {
 		return;
diff --git a/lasso/saml-2.0/provider.c b/lasso/saml-2.0/provider.c
index 04db308f..b7e982d5 100644
--- a/lasso/saml-2.0/provider.c
+++ b/lasso/saml-2.0/provider.c
@@ -274,7 +274,7 @@ lasso_saml20_provider_get_assertion_consumer_service_url(LassoProvider *provider
 }
 
 static void
-add_assertion_consumer_url_to_list(gchar *key, gpointer value, GList **list)
+add_assertion_consumer_url_to_list(gchar *key, G_GNUC_UNUSED gpointer value, GList **list)
 {
 	if (strncmp(key, "AssertionConsumerService", 24) == 0) {
 		*list = g_list_append(*list, key);
diff --git a/lasso/saml-2.0/server.c b/lasso/saml-2.0/server.c
index cfa16efe..84f86235 100644
--- a/lasso/saml-2.0/server.c
+++ b/lasso/saml-2.0/server.c
@@ -28,7 +28,7 @@
 
 
 int 
-lasso_saml20_server_load_affiliation(LassoServer *server, xmlDoc *doc, xmlNode *node)
+lasso_saml20_server_load_affiliation(LassoServer *server, xmlNode *node)
 {
 	xmlNode *t;
 	char *owner_id, *member_id, *affiliation_id;
diff --git a/lasso/saml-2.0/serverprivate.h b/lasso/saml-2.0/serverprivate.h
index 28e41138..b32867a1 100644
--- a/lasso/saml-2.0/serverprivate.h
+++ b/lasso/saml-2.0/serverprivate.h
@@ -32,7 +32,7 @@ extern "C" {
 #include <lasso/xml/xml.h>
 #include <lasso/id-ff/server.h>
 
-int lasso_saml20_server_load_affiliation(LassoServer *server, xmlDoc *doc, xmlNode *node);
+int lasso_saml20_server_load_affiliation(LassoServer *server, xmlNode *node);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_response.c b/lasso/xml/id-wsf-2.0/dst_delete_response.c
index 6ff73e99..2139fde5 100644
--- a/lasso/xml/id-wsf-2.0/dst_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/dst_delete_response.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2DstDeleteResponse *node)
-{
-}
-
-static void
 class_init(LassoIdWsf2DstDeleteResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_idwsf2_dst_delete_response_get_type()
 			NULL,
 			sizeof(LassoIdWsf2DstDeleteResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_response.c b/lasso/xml/id-wsf-2.0/dstref_create_response.c
index a391f5cd..5a29c2bc 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_create_response.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2DstRefCreateResponse *node)
-{
-}
-
-static void
 class_init(LassoIdWsf2DstRefCreateResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_idwsf2_dstref_create_response_get_type()
 			NULL,
 			sizeof(LassoIdWsf2DstRefCreateResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_response.c b/lasso/xml/id-wsf-2.0/dstref_delete_response.c
index 2a98cc38..21df3b27 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_response.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2DstRefDeleteResponse *node)
-{
-}
-
-static void
 class_init(LassoIdWsf2DstRefDeleteResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_idwsf2_dstref_delete_response_get_type()
 			NULL,
 			sizeof(LassoIdWsf2DstRefDeleteResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/subs_notify_response.c b/lasso/xml/id-wsf-2.0/subs_notify_response.c
index 522e6393..cdfef6bb 100644
--- a/lasso/xml/id-wsf-2.0/subs_notify_response.c
+++ b/lasso/xml/id-wsf-2.0/subs_notify_response.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2SubsNotifyResponse *node)
-{
-}
-
-static void
 class_init(LassoIdWsf2SubsNotifyResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_idwsf2_subs_notify_response_get_type()
 			NULL,
 			sizeof(LassoIdWsf2SubsNotifyResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_response.c b/lasso/xml/id-wsf-2.0/subsref_create_response.c
index be20f22a..62a7d586 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_create_response.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2SubsRefCreateResponse *node)
-{
-}
-
-static void
 class_init(LassoIdWsf2SubsRefCreateResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_idwsf2_subsref_create_response_get_type()
 			NULL,
 			sizeof(LassoIdWsf2SubsRefCreateResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_response.c b/lasso/xml/id-wsf-2.0/subsref_delete_response.c
index d3d6e236..828e06f9 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_response.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2SubsRefDeleteResponse *node)
-{
-}
-
-static void
 class_init(LassoIdWsf2SubsRefDeleteResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_idwsf2_subsref_delete_response_get_type()
 			NULL,
 			sizeof(LassoIdWsf2SubsRefDeleteResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_response.c b/lasso/xml/id-wsf-2.0/subsref_modify_response.c
index 119d7c7a..ae611abf 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_response.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2SubsRefModifyResponse *node)
-{
-}
-
-static void
 class_init(LassoIdWsf2SubsRefModifyResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_idwsf2_subsref_modify_response_get_type()
 			NULL,
 			sizeof(LassoIdWsf2SubsRefModifyResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify_response.c b/lasso/xml/id-wsf-2.0/subsref_notify_response.c
index aecc0e4c..382a742d 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notify_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_notify_response.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2SubsRefNotifyResponse *node)
-{
-}
-
-static void
 class_init(LassoIdWsf2SubsRefNotifyResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_idwsf2_subsref_notify_response_get_type()
 			NULL,
 			sizeof(LassoIdWsf2SubsRefNotifyResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/util_empty.c b/lasso/xml/id-wsf-2.0/util_empty.c
index aede4551..8a2f6462 100644
--- a/lasso/xml/id-wsf-2.0/util_empty.c
+++ b/lasso/xml/id-wsf-2.0/util_empty.c
@@ -60,11 +60,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2UtilEmpty *node)
-{
-}
-
-static void
 class_init(LassoIdWsf2UtilEmptyClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -91,7 +86,7 @@ lasso_idwsf2_util_empty_get_type()
 			NULL,
 			sizeof(LassoIdWsf2UtilEmpty),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/util_extension.c b/lasso/xml/id-wsf-2.0/util_extension.c
index ef331943..a9f6a39a 100644
--- a/lasso/xml/id-wsf-2.0/util_extension.c
+++ b/lasso/xml/id-wsf-2.0/util_extension.c
@@ -62,11 +62,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2Utilextension *node)
-{
-}
-
-static void
 class_init(LassoIdWsf2UtilextensionClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -93,7 +88,7 @@ lasso_idwsf2_util_extension_get_type()
 			NULL,
 			sizeof(LassoIdWsf2Utilextension),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/lib_logout_response.c b/lasso/xml/lib_logout_response.c
index 9a519425..21c91fb2 100644
--- a/lasso/xml/lib_logout_response.c
+++ b/lasso/xml/lib_logout_response.c
@@ -44,11 +44,6 @@
 /*****************************************************************************/
 
 static void
-instance_init(LassoLibLogoutResponse *node)
-{
-}
-
-static void
 class_init(LassoLibLogoutResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -72,7 +67,7 @@ lasso_lib_logout_response_get_type()
 			NULL,
 			sizeof(LassoLibLogoutResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		logout_response_type = g_type_register_static(LASSO_TYPE_LIB_STATUS_RESPONSE,
diff --git a/lasso/xml/lib_register_name_identifier_response.c b/lasso/xml/lib_register_name_identifier_response.c
index 3c0cc1ef..01a2b9ba 100644
--- a/lasso/xml/lib_register_name_identifier_response.c
+++ b/lasso/xml/lib_register_name_identifier_response.c
@@ -45,11 +45,6 @@
 /*****************************************************************************/
 
 static void
-instance_init(LassoLibRegisterNameIdentifierResponse *node)
-{
-}
-
-static void
 class_init(LassoLibRegisterNameIdentifierResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -73,7 +68,7 @@ lasso_lib_register_name_identifier_response_get_type()
 			NULL,
 			sizeof(LassoLibRegisterNameIdentifierResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		register_name_identifier_response_type = g_type_register_static(
diff --git a/lasso/xml/saml-2.0/saml2_condition_abstract.c b/lasso/xml/saml-2.0/saml2_condition_abstract.c
index 80cc96d9..69dd4d75 100644
--- a/lasso/xml/saml-2.0/saml2_condition_abstract.c
+++ b/lasso/xml/saml-2.0/saml2_condition_abstract.c
@@ -63,11 +63,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSaml2ConditionAbstract *node)
-{
-}
-
-static void
 class_init(LassoSaml2ConditionAbstractClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -94,7 +89,7 @@ lasso_saml2_condition_abstract_get_type()
 			NULL,
 			sizeof(LassoSaml2ConditionAbstract),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_one_time_use.c b/lasso/xml/saml-2.0/saml2_one_time_use.c
index 2b403241..306598d8 100644
--- a/lasso/xml/saml-2.0/saml2_one_time_use.c
+++ b/lasso/xml/saml-2.0/saml2_one_time_use.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSaml2OneTimeUse *node)
-{
-}
-
-static void
 class_init(LassoSaml2OneTimeUseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_saml2_one_time_use_get_type()
 			NULL,
 			sizeof(LassoSaml2OneTimeUse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML2_CONDITION_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/saml2_statement_abstract.c b/lasso/xml/saml-2.0/saml2_statement_abstract.c
index 420c7c95..9a4b57bf 100644
--- a/lasso/xml/saml-2.0/saml2_statement_abstract.c
+++ b/lasso/xml/saml-2.0/saml2_statement_abstract.c
@@ -67,11 +67,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSaml2StatementAbstract *node)
-{
-}
-
-static void
 class_init(LassoSaml2StatementAbstractClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -98,7 +93,7 @@ lasso_saml2_statement_abstract_get_type()
 			NULL,
 			sizeof(LassoSaml2StatementAbstract),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_extensions.c b/lasso/xml/saml-2.0/samlp2_extensions.c
index baefe221..cd0f3ad5 100644
--- a/lasso/xml/saml-2.0/samlp2_extensions.c
+++ b/lasso/xml/saml-2.0/samlp2_extensions.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlp2Extensions *node)
-{
-}
-
-static void
 class_init(LassoSamlp2ExtensionsClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_samlp2_extensions_get_type()
 			NULL,
 			sizeof(LassoSamlp2Extensions),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c b/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c
index 76ef2846..dd2f1426 100644
--- a/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c
+++ b/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c
@@ -82,11 +82,6 @@ init_from_query(LassoNode *node, char **query_fields)
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlp2ManageNameIDResponse *node)
-{
-}
-
-static void
 class_init(LassoSamlp2ManageNameIDResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -115,7 +110,7 @@ lasso_samlp2_manage_name_id_response_get_type()
 			NULL,
 			sizeof(LassoSamlp2ManageNameIDResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_STATUS_RESPONSE,
diff --git a/lasso/xml/saml-2.0/samlp2_status_detail.c b/lasso/xml/saml-2.0/samlp2_status_detail.c
index 7f3ce7a3..67bafc04 100644
--- a/lasso/xml/saml-2.0/samlp2_status_detail.c
+++ b/lasso/xml/saml-2.0/samlp2_status_detail.c
@@ -57,11 +57,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlp2StatusDetail *node)
-{
-}
-
-static void
 class_init(LassoSamlp2StatusDetailClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +83,7 @@ lasso_samlp2_status_detail_get_type()
 			NULL,
 			sizeof(LassoSamlp2StatusDetail),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_terminate.c b/lasso/xml/saml-2.0/samlp2_terminate.c
index c31ae8a0..2d7ddd2a 100644
--- a/lasso/xml/saml-2.0/samlp2_terminate.c
+++ b/lasso/xml/saml-2.0/samlp2_terminate.c
@@ -53,11 +53,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlp2Terminate *node)
-{
-}
-
-static void
 class_init(LassoSamlp2TerminateClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -84,7 +79,7 @@ lasso_samlp2_terminate_get_type()
 			NULL,
 			sizeof(LassoSamlp2Terminate),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_assertion.c b/lasso/xml/saml_assertion.c
index f812dea4..ee2170f0 100644
--- a/lasso/xml/saml_assertion.c
+++ b/lasso/xml/saml_assertion.c
@@ -171,11 +171,6 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlAssertion *assertion)
-{
-}
-
-static void
 class_init(LassoSamlAssertionClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -205,7 +200,7 @@ lasso_saml_assertion_get_type()
 			NULL,
 			sizeof(LassoSamlAssertion),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_condition_abstract.c b/lasso/xml/saml_condition_abstract.c
index 0d38d521..d87f7bba 100644
--- a/lasso/xml/saml_condition_abstract.c
+++ b/lasso/xml/saml_condition_abstract.c
@@ -46,11 +46,6 @@
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlConditionAbstract *node)
-{
-}
-
-static void
 class_init(LassoSamlConditionAbstractClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -75,7 +70,7 @@ lasso_saml_condition_abstract_get_type()
 			NULL,
 			sizeof(LassoSamlConditionAbstract),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_statement_abstract.c b/lasso/xml/saml_statement_abstract.c
index 0480e44e..ea8afb74 100644
--- a/lasso/xml/saml_statement_abstract.c
+++ b/lasso/xml/saml_statement_abstract.c
@@ -46,11 +46,6 @@
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlStatementAbstract *node)
-{
-}
-
-static void
 class_init(LassoSamlStatementAbstractClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -75,7 +70,7 @@ lasso_saml_statement_abstract_get_type()
 			NULL,
 			sizeof(LassoSamlStatementAbstract),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_subject_statement.c b/lasso/xml/saml_subject_statement.c
index 9a837053..996c7284 100644
--- a/lasso/xml/saml_subject_statement.c
+++ b/lasso/xml/saml_subject_statement.c
@@ -39,11 +39,6 @@ The schema fragment (oasis-sstc-saml-schema-assertion-1.0.xsd):
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlSubjectStatement *node)
-{
-}
-
-static void
 class_init(LassoSamlSubjectStatementClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -68,7 +63,7 @@ lasso_saml_subject_statement_get_type()
 			NULL,
 			sizeof(LassoSamlSubjectStatement),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT,
diff --git a/lasso/xml/samlp_status_code.c b/lasso/xml/samlp_status_code.c
index 43f541d9..cebe7b3f 100644
--- a/lasso/xml/samlp_status_code.c
+++ b/lasso/xml/samlp_status_code.c
@@ -56,12 +56,6 @@ static struct XmlSnippet schema_snippets[] = {
 /* instance and class init functions                                         */
 /*****************************************************************************/
 
-
-static void
-instance_init(LassoSamlpStatusCode *node)
-{
-}
-
 static void
 class_init(LassoSamlpStatusCodeClass *klass)
 {
@@ -88,7 +82,7 @@ lasso_samlp_status_code_get_type()
 			NULL,
 			sizeof(LassoSamlpStatusCode),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index 1ee8908c..b2783bec 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -697,7 +697,7 @@ _debug(GLogLevelFlags level, const char *filename, int line,
 }
 
 int
-error_code(GLogLevelFlags level, int error, ...)
+error_code(G_GNUC_UNUSED GLogLevelFlags level, int error, ...)
 {
 	const char *format;
 	char message[1024];
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index fa900e0b..f68db56e 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -1196,7 +1196,7 @@ lasso_node_impl_init_from_xml(LassoNode *node, xmlNode *xmlnode)
 /*****************************************************************************/
 
 static char*
-lasso_node_impl_build_query(LassoNode *node)
+lasso_node_impl_build_query(G_GNUC_UNUSED LassoNode *node)
 {
 	g_assert_not_reached();
 	return NULL;
@@ -1369,11 +1369,6 @@ lasso_node_finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoNode *node)
-{
-}
-
-static void
 class_init(LassoNodeClass *class)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS(class);
@@ -1426,7 +1421,7 @@ lasso_node_get_type()
 			NULL,
 			sizeof(LassoNode),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(G_TYPE_OBJECT , "LassoNode", &this_info, 0);