diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-09-29 16:28:10 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-09-29 16:28:10 +0200 |
| commit | 1b11a90afead9a0d8f7a3fd830c806b0c116adf3 (patch) | |
| tree | 7f36bb242e040a2d7efe9200b26882040684a19f /gck/gck-modules.c | |
| parent | f7003cd2f252d599c369afdb00c3ef8d14f1b09a (diff) | |
| download | gcr-1b11a90afead9a0d8f7a3fd830c806b0c116adf3.tar.gz | |
gck: More introspection tweaks, checking for parameters which allow none
Diffstat (limited to 'gck/gck-modules.c')
| -rw-r--r-- | gck/gck-modules.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gck/gck-modules.c b/gck/gck-modules.c index 5c5ccb4..497d2ff 100644 --- a/gck/gck-modules.c +++ b/gck/gck-modules.c @@ -207,7 +207,9 @@ gck_modules_get_slots (GList *modules, gboolean token_present) * with g_object_unref(). **/ GckEnumerator* -gck_modules_enumerate_objects (GList *modules, GckAttributes *attrs, guint session_options) +gck_modules_enumerate_objects (GList *modules, + GckAttributes *attrs, + GckSessionOptions session_options) { GckUriData *uri_data; @@ -291,6 +293,8 @@ gck_modules_token_for_uri (GList *modules, GList *results; GckSlot *slot = NULL; + g_return_val_if_fail (uri != NULL, NULL); + results = tokens_for_uri (modules, uri, TRUE, error); if (results) slot = g_object_ref (results->data); @@ -316,6 +320,8 @@ gck_modules_tokens_for_uri (GList *modules, const gchar *uri, GError **error) { + g_return_val_if_fail (uri != NULL, NULL); + return tokens_for_uri (modules, uri, FALSE, error); } @@ -341,7 +347,7 @@ gck_modules_object_for_uri (GList *modules, const gchar *uri, guint session_opti GckEnumerator *en; GckObject *result; - g_return_val_if_fail (uri, NULL); + g_return_val_if_fail (uri != NULL, NULL); g_return_val_if_fail (!error || !*error, NULL); en = gck_modules_enumerate_uri (modules, uri, session_options, error); @@ -377,7 +383,7 @@ gck_modules_objects_for_uri (GList *modules, const gchar *uri, guint session_opt GckEnumerator *en; GList *results; - g_return_val_if_fail (uri, NULL); + g_return_val_if_fail (uri != NULL, NULL); g_return_val_if_fail (!error || !*error, NULL); en = gck_modules_enumerate_uri (modules, uri, session_options, error); @@ -410,6 +416,8 @@ gck_modules_enumerate_uri (GList *modules, const gchar *uri, guint session_optio { GckUriData *uri_data; + g_return_val_if_fail (uri != NULL, NULL); + uri_data = gck_uri_parse (uri, GCK_URI_FOR_ANY, error); if (uri_data == NULL) return NULL; |