fixed various bugs with new compilation flags

12 files changed, 35 insertions, 60 deletions

diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index 2efde058..b9022e1d 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -204,7 +204,7 @@ struct HelperStruct {
  * Helper function for lasso_identity_get_offerings, match them with a service
  * type string */
 static
-void add_matching_resource_offering_to_list(char *name, LassoDiscoResourceOffering *offering,
+void add_matching_resource_offering_to_list(G_GNUC_UNUSED char *name, LassoDiscoResourceOffering *offering,
 	struct HelperStruct *ctx)
 {
 	if (ctx->service_type == NULL ||
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 87f6033d..09570790 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -175,9 +175,6 @@
 #include <lasso/saml-2.0/loginprivate.h>
 
 
-#ifdef LASSO_WSF_ENABLED
-static void lasso_login_assertion_add_discovery(LassoLogin *login);
-#endif
 static void lasso_login_build_assertion_artifact(LassoLogin *login);
 
 /*****************************************************************************/
@@ -195,7 +192,7 @@ static void lasso_login_build_assertion_artifact(LassoLogin *login);
  * there is a discovery service.
  **/
 static void
-lasso_login_assertion_add_discovery(LassoLogin *login)
+lasso_login_assertion_add_discovery(LassoLogin *login, LassoSamlAssertion *assertion)
 {
 	LassoProfile *profile = LASSO_PROFILE(login);
 	LassoDiscoResourceOffering *resourceOffering;
@@ -323,6 +320,7 @@ lasso_login_build_assertion(LassoLogin *login,
 
 	assertion->AuthenticationStatement = LASSO_SAML_AUTHENTICATION_STATEMENT(as);
 
+	/* Save signing material in assertion private datas to be able to sign later */
 	if (profile->server->certificate) {
 		assertion->sign_type = LASSO_SIGNATURE_TYPE_WITHX509;
 	} else {
@@ -340,7 +338,7 @@ lasso_login_build_assertion(LassoLogin *login,
 	}
 
 #ifdef LASSO_WSF_ENABLED
-	lasso_login_assertion_add_discovery(login);
+	lasso_login_assertion_add_discovery(login, assertion);
 #endif
 
 	/* store assertion in session object */
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 9f5ea911..a138e579 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -361,7 +361,7 @@ add_provider_childnode(G_GNUC_UNUSED gchar *key, LassoProvider *value, xmlNode *
 
 #ifdef LASSO_WSF_ENABLED
 static void
-add_service_childnode(gchar *key, LassoNode *value, xmlNode *xmlnode)
+add_service_childnode(G_GNUC_UNUSED gchar *key, LassoNode *value, xmlNode *xmlnode)
 {
 	xmlAddChild(xmlnode, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE));
 }
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index 1441c6e5..b5d6c8e1 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -473,12 +473,12 @@ lasso_session_get_assertion_identity_token(LassoSession *session, const gchar *s
 
 static LassoNodeClass *parent_class = NULL;
 
-struct DumpContext {
+typedef struct _DumpContext {
 	xmlNode *parent;
-};
+} DumpContext;
 
 static void
-add_assertion_childnode(gchar *key, LassoLibAssertion *value, struct DumpContext *context)
+add_assertion_childnode(gchar *key, LassoLibAssertion *value, DumpContext *context)
 {
 	xmlNode *t;
 	xmlNode *xmlnode;
@@ -516,7 +516,7 @@ exit:
 }
 
 static void
-add_assertion_by_id(gchar *key, xmlNode *value, struct DumpContext *context)
+add_assertion_by_id(gchar *key, xmlNode *value, DumpContext *context)
 {
 	xmlNode *t, *xmlnode;
 	xmlChar *content;
@@ -533,7 +533,7 @@ add_assertion_by_id(gchar *key, xmlNode *value, struct DumpContext *context)
 }
 
 static void
-add_status_childnode(gchar *key, LassoSamlpStatus *value, struct DumpContext *context)
+add_status_childnode(gchar *key, LassoSamlpStatus *value, DumpContext *context)
 {
 	xmlNode *t;
 	xmlNode *xmlnode;
@@ -546,7 +546,7 @@ add_status_childnode(gchar *key, LassoSamlpStatus *value, struct DumpContext *co
 
 #ifdef LASSO_WSF_ENABLED
 static void
-add_childnode_from_hashtable(gchar *key, LassoNode *value, struct DumpContext *context)
+add_childnode_from_hashtable(G_GNUC_UNUSED gchar *key, LassoNode *value, DumpContext *context)
 {
 	xmlNode *xmlnode;
 
@@ -560,7 +560,7 @@ get_xmlNode(LassoNode *node, G_GNUC_UNUSED gboolean lasso_dump)
 {
 	xmlNode *xmlnode;
 	LassoSession *session = LASSO_SESSION(node);
-	struct DumpContext context;
+	DumpContext context;
 #ifdef LASSO_WSF_ENABLED
 	xmlNode *t;
 #endif
diff --git a/lasso/id-wsf/authentication.c b/lasso/id-wsf/authentication.c
index c6069676..1edaae89 100644
--- a/lasso/id-wsf/authentication.c
+++ b/lasso/id-wsf/authentication.c
@@ -32,13 +32,13 @@
 static sasl_callback_t lasso_sasl_callbacks[5];
 
 static int
-lasso_sasl_cb_log(void* context, int priority, const char* message)
+lasso_sasl_cb_log(G_GNUC_UNUSED void* context, G_GNUC_UNUSED int priority, G_GNUC_UNUSED const char* message)
 {
 	return SASL_OK;
 }
 
 static int
-lasso_sasl_cb_authname(void* context, int id, const char** result, unsigned* len)
+lasso_sasl_cb_authname(void* context, G_GNUC_UNUSED int id, const char** result, unsigned* len)
 {
 	LassoUserAccount *account;
 	int ret = SASL_FAIL;
@@ -57,7 +57,7 @@ lasso_sasl_cb_authname(void* context, int id, const char** result, unsigned* len
 }
 
 static int
-lasso_sasl_cb_pass(sasl_conn_t* conn, void* context, int id, sasl_secret_t** psecret)
+lasso_sasl_cb_pass(G_GNUC_UNUSED sasl_conn_t* conn, void* context, G_GNUC_UNUSED int id, sasl_secret_t** psecret)
 {
 	static sasl_secret_t *s;
 	LassoUserAccount *account;
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index 6315bb8c..6816332a 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -108,7 +108,7 @@ static LassoDsKeyInfo* lasso_discovery_build_key_info_node(LassoDiscovery *disco
 
 /* Needs REVIEW */
 static gchar*
-lasso_discovery_build_credential(LassoDiscovery *discovery, const gchar *providerId)
+lasso_discovery_build_credential(LassoDiscovery *discovery, G_GNUC_UNUSED const gchar *providerId)
 {
 	/* XXX: providerId parameter is never used */
 
@@ -309,9 +309,9 @@ lasso_discovery_add_requested_service_type(LassoDiscovery *discovery,
  * @Deprecated: Since 2.2.1, use lasso_discovery_init_insert() instead.
  */
 gint
-lasso_discovery_init_modify(LassoDiscovery *discovery,
-		LassoDiscoResourceOffering *resourceOffering,
-		LassoDiscoDescription *description)
+lasso_discovery_init_modify(G_GNUC_UNUSED LassoDiscovery *discovery,
+		G_GNUC_UNUSED LassoDiscoResourceOffering *resourceOffering,
+		G_GNUC_UNUSED LassoDiscoDescription *description)
 {
 	return 0;
 }
diff --git a/lasso/id-wsf/interaction_profile_service.c b/lasso/id-wsf/interaction_profile_service.c
index 85125816..2e4b76f0 100644
--- a/lasso/id-wsf/interaction_profile_service.c
+++ b/lasso/id-wsf/interaction_profile_service.c
@@ -86,12 +86,6 @@ static LassoInteractionProfileServiceClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoInteractionProfileService *pp)
-{
-
-}
-
-static void
 class_init(LassoInteractionProfileServiceClass *klass)
 {
 	parent_class = g_type_class_peek_parent(klass);
@@ -113,7 +107,7 @@ lasso_interaction_profile_service_get_type()
 			NULL,
 			sizeof(LassoInteractionProfileService),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_WSF_PROFILE,
diff --git a/lasso/id-wsf/personal_profile_service.c b/lasso/id-wsf/personal_profile_service.c
index dbf2c308..07291b72 100644
--- a/lasso/id-wsf/personal_profile_service.c
+++ b/lasso/id-wsf/personal_profile_service.c
@@ -79,18 +79,6 @@ lasso_personal_profile_service_get_email(LassoPersonalProfileService *service)
 /* instance and class init functions                                         */
 /*****************************************************************************/
 
-static void
-instance_init(LassoPersonalProfileService *service)
-{
-
-}
-
-static void
-class_init(LassoPersonalProfileServiceClass *klass)
-{
-
-}
-
 GType
 lasso_personal_profile_service_get_type()
 {
@@ -103,12 +91,12 @@ lasso_personal_profile_service_get_type()
 			sizeof(LassoPersonalProfileServiceClass),
 			NULL,
 			NULL,
-			(GClassInitFunc) class_init,
+			NULL,
 			NULL,
 			NULL,
 			sizeof(LassoPersonalProfileService),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_DATA_SERVICE,
diff --git a/lasso/id-wsf/wsf_profile.c b/lasso/id-wsf/wsf_profile.c
index 1c39c300..5866d5d5 100644
--- a/lasso/id-wsf/wsf_profile.c
+++ b/lasso/id-wsf/wsf_profile.c
@@ -217,7 +217,7 @@ lasso_wsf_profile_build_soap_envelope_internal(const char *refToMessageId, const
  * Return value: 0.
  */
 gint
-lasso_wsf_profile_move_credentials(LassoWsfProfile *src, LassoWsfProfile *dest)
+lasso_wsf_profile_move_credentials(G_GNUC_UNUSED LassoWsfProfile *src, G_GNUC_UNUSED LassoWsfProfile *dest)
 {
 	return 0;
 }
@@ -232,7 +232,7 @@ lasso_wsf_profile_move_credentials(LassoWsfProfile *src, LassoWsfProfile *dest)
  * Return value: 0.
  */
 gint
-lasso_wsf_profile_add_credential(LassoWsfProfile *profile, xmlNode *credential)
+lasso_wsf_profile_add_credential(G_GNUC_UNUSED LassoWsfProfile *profile, G_GNUC_UNUSED xmlNode *credential)
 {
 	return 0;
 }
@@ -461,7 +461,7 @@ lasso_wsf_profile_build_soap_envelope(const char *refToMessageId, const char *pr
  * Return value: FALSE.
  **/
 gboolean
-lasso_wsf_profile_principal_is_online(LassoWsfProfile *profile)
+lasso_wsf_profile_principal_is_online(G_GNUC_UNUSED LassoWsfProfile *profile)
 {
 	return FALSE;
 }
@@ -475,7 +475,7 @@ lasso_wsf_profile_principal_is_online(LassoWsfProfile *profile)
  *
  **/
 void
-lasso_wsf_profile_set_principal_status(LassoWsfProfile *profile, const char *status)
+lasso_wsf_profile_set_principal_status(G_GNUC_UNUSED LassoWsfProfile *profile, G_GNUC_UNUSED const char *status)
 {
 }
 
@@ -487,7 +487,7 @@ lasso_wsf_profile_set_principal_status(LassoWsfProfile *profile, const char *sta
  *
  **/
 void
-lasso_wsf_profile_set_principal_online(LassoWsfProfile *profile)
+lasso_wsf_profile_set_principal_online(G_GNUC_UNUSED LassoWsfProfile *profile)
 {
 }
 
@@ -499,7 +499,7 @@ lasso_wsf_profile_set_principal_online(LassoWsfProfile *profile)
  *
  **/
 void
-lasso_wsf_profile_set_principal_offline(LassoWsfProfile *profile)
+lasso_wsf_profile_set_principal_offline(G_GNUC_UNUSED LassoWsfProfile *profile)
 {
 }
 
@@ -742,7 +742,7 @@ lasso_wsf_profile_build_soap_response_msg(LassoWsfProfile *profile)
 
 gint
 lasso_wsf_profile_process_soap_request_msg(LassoWsfProfile *profile, const gchar *message,
-	const gchar *service_type, const gchar *security_mech_id)
+	G_GNUC_UNUSED const gchar *service_type, const gchar *security_mech_id)
 {
 	LassoSoapBindingCorrelation *correlation = NULL;
 	LassoSoapEnvelope *envelope = NULL;
@@ -886,8 +886,9 @@ exit:
  *
  * Return value: NULL
  */
-LassoSoapBindingProvider *lasso_wsf_profile_set_provider_soap_request(LassoWsfProfile *profile,
-	const char *providerId)
+LassoSoapBindingProvider *
+lasso_wsf_profile_set_provider_soap_request(G_GNUC_UNUSED LassoWsfProfile *profile,
+	G_GNUC_UNUSED const char *providerId)
 {
 	return NULL;
 }
diff --git a/lasso/xml/is_select.c b/lasso/xml/is_select.c
index 2c8229f2..8343e81f 100644
--- a/lasso/xml/is_select.c
+++ b/lasso/xml/is_select.c
@@ -104,7 +104,7 @@ lasso_is_select_get_type()
 }
 
 LassoIsSelect*
-lasso_is_select_new(LassoIsItem *item1, LassoIsItem *item2)
+lasso_is_select_new()
 {
 	LassoIsSelect *node;
 
diff --git a/lasso/xml/is_select.h b/lasso/xml/is_select.h
index 67e14b11..1744d6fd 100644
--- a/lasso/xml/is_select.h
+++ b/lasso/xml/is_select.h
@@ -59,8 +59,7 @@ struct _LassoIsSelectClass {
 
 LASSO_EXPORT GType lasso_is_select_get_type(void);
 
-LASSO_EXPORT LassoIsSelect* lasso_is_select_new(LassoIsItem *item1, LassoIsItem *item2);
-	/* FIXME : choose proper names */
+LASSO_EXPORT LassoIsSelect* lasso_is_select_new(void);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/sec_resource_access_statement.c b/lasso/xml/sec_resource_access_statement.c
index 12589818..e8facfe8 100644
--- a/lasso/xml/sec_resource_access_statement.c
+++ b/lasso/xml/sec_resource_access_statement.c
@@ -63,11 +63,6 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoSecResourceAccessStatement *node)
-{
-}
-
-static void
 class_init(LassoSecResourceAccessStatementClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -93,7 +88,7 @@ lasso_sec_resource_access_statement_get_type()
 			NULL,
 			sizeof(LassoSecResourceAccessStatement),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT,