[Core] replace all use of g_strcmp0 by lasso_strisequal and lasso_strisnotequal

Too much human errors with strcmp kind of functions. Also change name os
lasso_is_empty_string to lasso_strisempty.

3 files changed, 16 insertions, 13 deletions

diff --git a/lasso/xml/saml-2.0/saml2_name_id.c b/lasso/xml/saml-2.0/saml2_name_id.c
index 698cec0d..8405c47d 100644
--- a/lasso/xml/saml-2.0/saml2_name_id.c
+++ b/lasso/xml/saml-2.0/saml2_name_id.c
@@ -163,13 +163,13 @@ lasso_saml2_name_id_equals(LassoSaml2NameID *name_id, LassoSaml2NameID *other_na
 		return FALSE;
 
 	/* check optional content */
-	if (g_strcmp0(name_id->Format, other_name_id->Format) != 0)
+	if (lasso_strisnotequal(name_id->Format,other_name_id->Format))
 		return FALSE;
-	if (g_strcmp0(name_id->SPProvidedID, other_name_id->SPProvidedID) != 0)
+	if (lasso_strisnotequal(name_id->SPProvidedID,other_name_id->SPProvidedID))
 		return FALSE;
-	if (g_strcmp0(name_id->NameQualifier, other_name_id->NameQualifier) != 0)
+	if (lasso_strisnotequal(name_id->NameQualifier,other_name_id->NameQualifier))
 		return FALSE;
-	if (g_strcmp0(name_id->SPNameQualifier, other_name_id->SPNameQualifier) != 0)
+	if (lasso_strisnotequal(name_id->SPNameQualifier,other_name_id->SPNameQualifier))
 		return FALSE;
 
 	return TRUE;
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index d521a4c6..f73e93e4 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -823,7 +823,7 @@ lasso_saml2_query_verify_signature(const char *query, const xmlSecKey *sender_pu
 		goto done;
 	}
 	usig_alg = xmlURIUnescapeString(sig_alg, 0, NULL);
-	if (g_strcmp0(usig_alg, (char*)xmlSecHrefRsaSha1) == 0) {
+	if (lasso_strisequal(usig_alg,(char *)xmlSecHrefRsaSha1)) {
 		if (sender_public_key->value->id != xmlSecOpenSSLKeyDataRsaId) {
 			ret = critical_error(LASSO_DS_ERROR_PUBLIC_KEY_LOAD_FAILED);
 			goto done;
@@ -834,7 +834,7 @@ lasso_saml2_query_verify_signature(const char *query, const xmlSecKey *sender_pu
 			goto done;
 		}
 		key_size = RSA_size(rsa);
-	} else if (g_strcmp0(usig_alg, (char*)xmlSecHrefDsaSha1) == 0) {
+	} else if (lasso_strisequal(usig_alg,(char *)xmlSecHrefDsaSha1)) {
 		if (sender_public_key->value->id != xmlSecOpenSSLKeyDataDsaId) {
 			ret = critical_error(LASSO_DS_ERROR_PUBLIC_KEY_LOAD_FAILED);
 			goto done;
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index e3c1db30..e143bbff 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -1566,7 +1566,7 @@ _xmlnode_add_custom_namespace(const char *prefix, const char *href, xmlNode *xml
 
 	existing = xmlSearchNs(NULL, xmlnode, BAD_CAST prefix);
 	if (existing) {
-		if (g_strcmp0((char*)existing->href, href) != 0) {
+		if (lasso_strisnotequal((char *)existing->href,href)) {
 			message(G_LOG_LEVEL_CRITICAL, "Cannot add namespace %s='%s' to node %s, "
 					"namespace already exists with another href", prefix, href,
 					(char*)xmlnode->name);
@@ -2172,16 +2172,19 @@ lasso_node_new_from_xmlNode(xmlNode *xmlnode)
 	if (! fromXsi) {
 		/* if the typename was not obtained via xsi:type but through mapping of the element
 		 * name then keep the element name */
-		if (LASSO_NODE_GET_CLASS(node)->node_data && LASSO_NODE_GET_CLASS(node)->node_data->node_name && g_strcmp0((char*)xmlnode->name,
-					LASSO_NODE_GET_CLASS(node)->node_data->node_name) != 0) {
+		if (LASSO_NODE_GET_CLASS(node)->node_data &&
+				LASSO_NODE_GET_CLASS(node)->node_data->node_name &&
+				lasso_strisnotequal((char*)xmlnode->name,
+					LASSO_NODE_GET_CLASS(node)->node_data->node_name))
+		{
 			lasso_node_set_custom_nodename(node, (char*)xmlnode->name);
 		}
 
 		if (xmlnode->ns && (LASSO_NODE_GET_CLASS(node)->node_data == NULL ||
 					LASSO_NODE_GET_CLASS(node)->node_data->ns == NULL ||
-					g_strcmp0((char*)xmlnode->ns->href,
-						(char*)LASSO_NODE_GET_CLASS(node)->node_data->ns->href)
-					!= 0)) {
+					lasso_xmlstrisnotequal(xmlnode->ns->href,
+						LASSO_NODE_GET_CLASS(node)->node_data->ns->href)))
+		{
 			lasso_node_set_custom_namespace(node, (char*)xmlnode->ns->prefix,
 					(char*)xmlnode->ns->href);
 		}
@@ -3128,7 +3131,7 @@ xml_insure_namespace(xmlNode *xmlnode, xmlNs *ns, gboolean force, gchar *ns_href
 
 	if (ns == NULL) {
 		for (ns = xmlnode->nsDef; ns; ns = ns->next) {
-			if (ns->href && g_strcmp0((gchar*)ns->href, ns_href) == 0) {
+			if (ns->href && lasso_strisequal((gchar *)ns->href,ns_href)) {
 				break;
 			}
 		}