fix warnings about unused but set variables

9 files changed, 13 insertions, 42 deletions

diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 9191e033..601cf125 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -2251,7 +2251,6 @@ gint
 lasso_login_process_response_msg(LassoLogin *login, gchar *response_msg)
 {
 	LassoProfile *profile;
-	LassoSamlpResponse *response;
 
 	g_return_val_if_fail(LASSO_IS_LOGIN(login), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 	g_return_val_if_fail(response_msg != NULL, LASSO_PARAM_ERROR_INVALID_VALUE);
@@ -2269,7 +2268,6 @@ lasso_login_process_response_msg(LassoLogin *login, gchar *response_msg)
 		lasso_release_gobject(profile->response);
 		return critical_error(LASSO_PROFILE_ERROR_INVALID_MSG);
 	}
-	response = LASSO_SAMLP_RESPONSE(profile->response);
 
 	/* Validate RequestID and InResponseTo */
 	if (profile->request || lasso_flag_strict_checking) {
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 51f82f4c..1feca4af 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -956,7 +956,6 @@ lasso_logout_validate_request(LassoLogout *logout)
 	LassoFederation *federation = NULL;
 	LassoProvider *remote_provider;
 	LassoSamlNameIdentifier *nameIdentifier;
-	LassoSamlAssertion *assertion;
 	LassoNode *assertion_n;
 	LassoLibLogoutRequest *logout_request = NULL;
 
@@ -1039,8 +1038,6 @@ lasso_logout_validate_request(LassoLogout *logout)
 		return LASSO_PROFILE_ERROR_MISSING_ASSERTION;
 	}
 
-	assertion = LASSO_SAML_ASSERTION(assertion_n);
-
 	/* If name identifier is federated, then verify federation */
 	if (strcmp(nameIdentifier->Format, LASSO_LIB_NAME_IDENTIFIER_FORMAT_FEDERATED) == 0) {
 		if (LASSO_IS_IDENTITY(profile->identity) == FALSE) {
@@ -1128,7 +1125,6 @@ static void
 check_soap_support(G_GNUC_UNUSED gchar *key, LassoProvider *provider, LassoProfile *profile)
 {
 	const GList *supported_profiles;
-	LassoSamlAssertion *assertion;
 	LassoNode *assertion_n;
 
 	if (strcmp(provider->ProviderID, profile->remote_providerID) == 0)
@@ -1138,7 +1134,6 @@ check_soap_support(G_GNUC_UNUSED gchar *key, LassoProvider *provider, LassoProfi
 	if (LASSO_IS_SAML_ASSERTION(assertion_n) == FALSE) {
 		return; /* not authenticated with this provider */
 	}
-	assertion = LASSO_SAML_ASSERTION(assertion_n);
 
 	supported_profiles = lasso_provider_get_metadata_list(provider,
 			"SingleLogoutProtocolProfile");
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index 7d554902..ab325c89 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -378,7 +378,6 @@ gint lasso_name_registration_process_request_msg(LassoNameRegistration *name_reg
 	LassoProfile *profile;
 	LassoProvider *remote_provider;
 	LassoMessageFormat format;
-	LassoSamlNameIdentifier *nameIdentifier;
 	LassoLibRegisterNameIdentifierRequest *request;
 
 	g_return_val_if_fail(LASSO_IS_NAME_REGISTRATION(name_registration),
@@ -411,8 +410,6 @@ gint lasso_name_registration_process_request_msg(LassoNameRegistration *name_reg
 
 	request = LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(profile->request);
 
-	nameIdentifier = LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(
-			profile->request)->SPProvidedNameIdentifier;
 	name_registration->oldNameIdentifier = NULL;
 	if (remote_provider->role == LASSO_PROVIDER_ROLE_IDP) {
 		/* IdP initiated */
@@ -452,7 +449,6 @@ lasso_name_registration_process_response_msg(LassoNameRegistration *name_registr
 	LassoProvider *remote_provider;
 	LassoFederation *federation;
 	LassoSamlNameIdentifier *nameIdentifier = NULL;
-	LassoHttpMethod response_method;
 	LassoLibStatusResponse *response;
 	LassoMessageFormat format;
 	int rc = 0;
@@ -470,10 +466,6 @@ lasso_name_registration_process_response_msg(LassoNameRegistration *name_registr
 	if (format == LASSO_MESSAGE_FORMAT_UNKNOWN || format == LASSO_MESSAGE_FORMAT_ERROR) {
 		return critical_error(LASSO_PROFILE_ERROR_INVALID_MSG);
 	}
-	if (format == LASSO_MESSAGE_FORMAT_SOAP)
-		response_method = LASSO_HTTP_METHOD_SOAP;
-	if (format == LASSO_MESSAGE_FORMAT_QUERY)
-		response_method = LASSO_HTTP_METHOD_REDIRECT;
 
 	remote_provider = lasso_server_get_provider(profile->server,
 			LASSO_LIB_STATUS_RESPONSE(profile->response)->ProviderID);
diff --git a/lasso/saml-2.0/login.c b/lasso/saml-2.0/login.c
index 7b96868d..02a659f6 100644
--- a/lasso/saml-2.0/login.c
+++ b/lasso/saml-2.0/login.c
@@ -200,11 +200,6 @@ _lasso_login_must_verify_authn_request_signature(LassoProfile *profile) {
 
 static gboolean
 _lasso_login_must_verify_signature(LassoProfile *profile) {
-	LassoProvider *remote_provider;
-
-	remote_provider = lasso_server_get_provider(profile->server,
-			profile->remote_providerID);
-
 	switch (lasso_profile_get_signature_verify_hint(profile)) {
 		case LASSO_PROFILE_SIGNATURE_VERIFY_HINT_MAYBE:
 			return lasso_flag_verify_signature;
@@ -227,10 +222,8 @@ lasso_saml20_login_build_authn_request_msg(LassoLogin *login)
 	LassoProfile *profile;
 	LassoSamlp2AuthnRequest *authn_request;
 	int rc = 0;
-	LassoHttpMethod http_method;
 
 	profile = &login->parent;
-	http_method = login->http_method;
 
 	lasso_extract_node_or_fail(authn_request, profile->request, SAMLP2_AUTHN_REQUEST,
 			LASSO_PROFILE_ERROR_INVALID_REQUEST);
diff --git a/lasso/saml-2.0/name_id_management.c b/lasso/saml-2.0/name_id_management.c
index 26fcfdc9..f633b561 100644
--- a/lasso/saml-2.0/name_id_management.c
+++ b/lasso/saml-2.0/name_id_management.c
@@ -124,7 +124,7 @@ lasso_name_id_management_init_request(LassoNameIdManagement *name_id_management,
 cleanup:
 	lasso_release_gobject(request);
 
-	return 0;
+	return rc;
 }
 
 
diff --git a/lasso/saml-2.0/profile.c b/lasso/saml-2.0/profile.c
index b98bb85e..09556f64 100644
--- a/lasso/saml-2.0/profile.c
+++ b/lasso/saml-2.0/profile.c
@@ -74,9 +74,9 @@ static char* lasso_saml20_profile_generate_artifact(LassoProfile *profile, int p
 static int
 get_provider(LassoProfile *profile, LassoProvider **provider_out)
 {
-	int rc = 0;
 	LassoProvider *provider;
 	LassoServer *server;
+	int rc = 0;
 
 	lasso_bad_param(PROFILE, profile);
 
@@ -89,7 +89,7 @@ get_provider(LassoProfile *profile, LassoProvider **provider_out)
 
 	*provider_out = provider;
 cleanup:
-	return 0;
+	return rc;
 }
 
 static char *
@@ -637,7 +637,6 @@ lasso_saml20_profile_process_any_request(LassoProfile *profile,
 		const char *request_msg)
 {
 	int rc = 0;
-	LassoSaml2NameID *name_id = NULL;
 	LassoProvider *remote_provider = NULL;
 	LassoSamlp2RequestAbstract *request_abstract = NULL;
 	LassoMessageFormat format;
@@ -676,7 +675,7 @@ lasso_saml20_profile_process_any_request(LassoProfile *profile,
 
 	lasso_extract_node_or_fail(request_abstract, profile->request, SAMLP2_REQUEST_ABSTRACT,
 			LASSO_PROFILE_ERROR_INVALID_MSG);
-	lasso_extract_node_or_fail(name_id, request_abstract->Issuer, SAML2_NAME_ID,
+	goto_cleanup_if_fail_with_rc(LASSO_IS_SAML2_NAME_ID(request_abstract->Issuer),
 			LASSO_PROFILE_ERROR_MISSING_ISSUER);
 	lasso_assign_string(profile->remote_providerID, request_abstract->Issuer->content);
 
@@ -1030,7 +1029,6 @@ lasso_saml20_profile_validate_request(LassoProfile *profile, gboolean needs_iden
 	int rc = 0;
 	LassoSamlp2RequestAbstract *request_abstract = NULL;
 	LassoSaml2NameID *issuer = NULL;
-	LassoIdentity *identity = NULL;
 	LassoProvider *provider = NULL;
 
 	lasso_bad_param(PROFILE, profile);
@@ -1040,7 +1038,7 @@ lasso_saml20_profile_validate_request(LassoProfile *profile, gboolean needs_iden
 			LASSO_PROFILE_ERROR_MISSING_REQUEST);
 	/* look for identity object */
 	if (needs_identity) {
-		lasso_extract_node_or_fail(identity, profile->identity, IDENTITY,
+		goto_cleanup_if_fail_with_rc(LASSO_IS_IDENTITY(profile->identity),
 				LASSO_PROFILE_ERROR_IDENTITY_NOT_FOUND);
 	}
 
@@ -1304,7 +1302,6 @@ lasso_saml20_profile_process_any_response(LassoProfile *profile,
 	LassoSamlp2StatusCode *status_code1 = NULL;
 	LassoMessageFormat format;
 	gboolean missing_issuer = FALSE;
-	LassoProfileSignatureVerifyHint signature_verify_hint;
 
 	xmlDoc *doc = NULL;
 	xmlNode *content = NULL;
@@ -1312,7 +1309,6 @@ lasso_saml20_profile_process_any_response(LassoProfile *profile,
 	lasso_bad_param(PROFILE, profile);
 	lasso_bad_param(SAMLP2_STATUS_RESPONSE, status_response);
 
-	signature_verify_hint = lasso_profile_get_signature_verify_hint(profile);
 	/* reset signature_status */
 	profile->signature_status = 0;
 	format = lasso_node_init_from_message_with_format((LassoNode*)status_response,
diff --git a/lasso/saml-2.0/saml2_helper.c b/lasso/saml-2.0/saml2_helper.c
index c49cbc3b..2fb3e919 100644
--- a/lasso/saml-2.0/saml2_helper.c
+++ b/lasso/saml-2.0/saml2_helper.c
@@ -310,11 +310,10 @@ void
 lasso_saml2_assertion_set_basic_conditions(LassoSaml2Assertion *saml2_assertion, time_t tolerance,
 		time_t length, gboolean one_time_use)
 {
-	LassoSaml2Conditions *saml2_conditions;
-
 	g_return_if_fail (LASSO_IS_SAML2_ASSERTION (saml2_assertion));
 
-	saml2_conditions = lasso_saml2_assertion_get_conditions (saml2_assertion, TRUE);
+	/* ensure conditions exists */
+	lasso_saml2_assertion_get_conditions (saml2_assertion, TRUE);
 	set_notbefore_and_notonorafter (saml2_assertion->Conditions, tolerance, length);
 	lasso_saml2_assertion_set_one_time_use(saml2_assertion, one_time_use);
 }
@@ -380,11 +379,11 @@ void
 lasso_saml2_assertion_add_proxy_limit (LassoSaml2Assertion *saml2_assertion, int proxy_count,
 		GList *proxy_audiences)
 {
-	LassoSaml2Conditions *saml2_conditions;
 	LassoSaml2ProxyRestriction *saml2_proxy_restriction;
 
 	g_return_if_fail (LASSO_IS_SAML2_ASSERTION (saml2_assertion));
-	saml2_conditions = lasso_saml2_assertion_get_conditions (saml2_assertion, TRUE);
+	/* ensure conditions exists */
+	lasso_saml2_assertion_get_conditions (saml2_assertion, TRUE);
 	saml2_proxy_restriction = (LassoSaml2ProxyRestriction*)lasso_saml2_proxy_restriction_new ();
 	if (proxy_count >= 0) {
 		saml2_proxy_restriction->Count = g_strdup_printf("%i", proxy_count);
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index 08c3eb1a..f73cb1f2 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -1916,7 +1916,6 @@ lasso_url_add_parameters(char *url,
 {
 	char *old_url = url, *new_url;
 	xmlChar *encoded_key, *encoded_value;
-	int rc = 0;
 	va_list ap;
 
 	va_start(ap, free);
@@ -1930,7 +1929,7 @@ lasso_url_add_parameters(char *url,
 			break;
 		}
 		encoded_key = xmlURIEscapeStr((xmlChar*)key, NULL);
-		goto_cleanup_if_fail_with_rc(encoded_key, 0);
+		goto_cleanup_if_fail(encoded_key);
 
 		value = va_arg(ap, char*);
 		if (! value) {
@@ -1938,7 +1937,7 @@ lasso_url_add_parameters(char *url,
 			break;
 		}
 		encoded_value = xmlURIEscapeStr((xmlChar*)value, NULL);
-		goto_cleanup_if_fail_with_rc(encoded_value, 0);
+		goto_cleanup_if_fail(encoded_value);
 
 		if (old_url) {
 			new_url = g_strdup_printf("%s&%s=%s", old_url, (char*)encoded_key, (char*)encoded_value);
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index b7b29f95..e3ac905d 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -1745,7 +1745,6 @@ lasso_node_impl_init_from_xml(LassoNode *node, xmlNode *xmlnode)
 	/* Collect signature parameters */
 	{
 			LassoSignatureMethod method = 0;
-			LassoSignatureType type = 0;
 			xmlChar *private_key = NULL;
 			xmlChar *private_key_password = NULL;
 			xmlChar *certificate = NULL;
@@ -3253,7 +3252,7 @@ lasso_node_init_from_saml2_query_fields(LassoNode *node, char **query_fields, G_
 static void
 xmlDeclareNs(xmlNode *root_node, xmlNode *node)
 {
-	xmlNs *ns, *ns2;
+	xmlNs *ns;
 	xmlNode *t;
 
 	if (strcmp((char*)node->name, "Signature") == 0)
@@ -3261,7 +3260,7 @@ xmlDeclareNs(xmlNode *root_node, xmlNode *node)
 
 	for (ns = node->nsDef; ns; ns = ns->next) {
 		if (ns->prefix && strcmp((char*)ns->prefix, "xsi") != 0) {
-			ns2 = xmlNewNs(root_node, ns->href, ns->prefix);
+			xmlNewNs(root_node, ns->href, ns->prefix);
 		}
 	}
 	for (t = node->children; t; t = t->next) {