change last g_* macros to lasso_ prefix

4 files changed, 18 insertions, 18 deletions

diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index 6aac00d7..ab3ce404 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -1171,7 +1171,7 @@ lasso_discovery_build_key_info_node(LassoDiscovery *discovery, const gchar *prov
 	xmlXPathContext *xpathCtx = NULL;
 	xmlXPathObject *xpathObj = NULL;
 
-	g_return_val_if_invalid_param(DISCOVERY, discovery, NULL);
+	lasso_return_val_if_invalid_param(DISCOVERY, discovery, NULL);
 	g_return_val_if_fail(providerID != NULL, NULL);
 
 	profile = &discovery->parent;
diff --git a/lasso/id-wsf/wsf_profile.c b/lasso/id-wsf/wsf_profile.c
index 7a5c5539..e1b64c67 100644
--- a/lasso/id-wsf/wsf_profile.c
+++ b/lasso/id-wsf/wsf_profile.c
@@ -151,7 +151,7 @@ lasso_wsf_profile_comply_with_security_mechanism(LassoWsfProfile *profile)
 {
 	char *sec_mech_id;
 
-	g_return_val_if_invalid_param(WSF_PROFILE, profile, 
+	lasso_return_val_if_invalid_param(WSF_PROFILE, profile, 
 			LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 	
 	sec_mech_id = profile->private_data->security_mech_id;
@@ -290,9 +290,9 @@ lasso_wsf_profile_set_description_from_offering(
 {
 	LassoDiscoDescription *description = NULL;
 
-	g_return_val_if_invalid_param(WSF_PROFILE, profile,
+	lasso_return_val_if_invalid_param(WSF_PROFILE, profile,
 			LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
-	g_return_val_if_invalid_param(DISCO_RESOURCE_OFFERING, offering,
+	lasso_return_val_if_invalid_param(DISCO_RESOURCE_OFFERING, offering,
 			LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 	if (security_mech_id == NULL) {
 		if (offering->ServiceInstance &&
@@ -335,7 +335,7 @@ gint
 lasso_wsf_profile_set_security_mech_id(LassoWsfProfile *profile,
 	const char *security_mech_id)
 {
-	g_return_val_if_invalid_param(WSF_PROFILE, profile,
+	lasso_return_val_if_invalid_param(WSF_PROFILE, profile,
 		LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 
 	if (security_mech_id == NULL) {
@@ -363,7 +363,7 @@ lasso_wsf_profile_set_security_mech_id(LassoWsfProfile *profile,
 const char *
 lasso_wsf_profile_get_security_mech_id(LassoWsfProfile *profile)
 {
-	g_return_val_if_invalid_param(WSF_PROFILE, profile,
+	lasso_return_val_if_invalid_param(WSF_PROFILE, profile,
 		NULL);
 
 	return profile->private_data->security_mech_id;
@@ -629,7 +629,7 @@ lasso_wsf_profile_init_soap_request(LassoWsfProfile *profile, LassoNode *request
 	LassoSoapEnvelope *envelope;
 	char *providerID = NULL;
 
-	g_return_val_if_invalid_param(WSF_PROFILE, profile,
+	lasso_return_val_if_invalid_param(WSF_PROFILE, profile,
 			LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 
 	if (profile->server) {
@@ -716,7 +716,7 @@ lasso_wsf_profile_build_soap_response_msg(LassoWsfProfile *profile)
 	xmlOutputBuffer *buf;
 	xmlCharEncodingHandler *handler;
 
-	g_return_val_if_invalid_param(WSF_PROFILE, profile, 
+	lasso_return_val_if_invalid_param(WSF_PROFILE, profile, 
 			LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 
 	envelope = profile->soap_envelope_response;
@@ -989,7 +989,7 @@ lasso_wsf_profile_init(LassoWsfProfile *profile,
 		LassoServer *server, 
 		LassoDiscoResourceOffering *offering)
 {
-	g_return_val_if_invalid_param(WSF_PROFILE, profile, 
+	lasso_return_val_if_invalid_param(WSF_PROFILE, profile, 
 			LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 	/* FIXME: is a NULL server authorized ? */
 	lasso_assign_gobject(profile->server, server);
@@ -1100,8 +1100,8 @@ create_signature_context(LassoServer *server, xmlSecDSigCtx **ctx_ptr) {
 	xmlSecDSigCtx *dsig_ctx = NULL;
 	gint rc = 0;
 
-	g_bad_param(SERVER, server);
-	g_null_param(ctx_ptr);
+	lasso_bad_param(SERVER, server);
+	lasso_null_param(ctx_ptr);
 
 	/* Allocate an initialize the object */
 	dsig_ctx = xmlSecDSigCtxCreate(NULL);
diff --git a/lasso/utils.h b/lasso/utils.h
index 8f897c6f..b21931a4 100644
--- a/lasso/utils.h
+++ b/lasso/utils.h
@@ -138,14 +138,14 @@
 	}
 
 /* Bad param handling */
-#define g_return_val_if_invalid_param(kind, name, val) \
-		g_return_val_if_fail(LASSO_IS_##kind(name), val)
+#define lasso_return_val_if_invalid_param(kind, name, val) \
+	g_return_val_if_fail(LASSO_IS_##kind(name), val)
 
-#define g_bad_param(kind, name) \
-	g_return_val_if_invalid_param(kind, name, \
+#define lasso_bad_param(kind, name) \
+	lasso_return_val_if_invalid_param(kind, name, \
 		LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 
-#define g_null_param(name) \
+#define lasso_null_param(name) \
 	g_return_val_if_fail(name != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 
 #define goto_exit_if_fail(condition, rc_value) \
diff --git a/lasso/xml/disco_description.c b/lasso/xml/disco_description.c
index 8712626a..dc919b1a 100644
--- a/lasso/xml/disco_description.c
+++ b/lasso/xml/disco_description.c
@@ -242,7 +242,7 @@ lasso_disco_description_has_saml_authentication(LassoDiscoDescription *descripti
 	GList *iter;
 	gchar *security_mech_id;
 
-	g_return_val_if_invalid_param(DISCO_DESCRIPTION, description,
+	lasso_return_val_if_invalid_param(DISCO_DESCRIPTION, description,
 			FALSE);
 
 	iter = description->SecurityMechID;
@@ -274,7 +274,7 @@ lasso_disco_description_has_x509_authentication(LassoDiscoDescription *descripti
 	GList *iter;
 	gchar *security_mech_id;
 
-	g_return_val_if_invalid_param(DISCO_DESCRIPTION, description,
+	lasso_return_val_if_invalid_param(DISCO_DESCRIPTION, description,
 			FALSE);
 
 	iter = description->SecurityMechID;