GNOME.org
 

[grilo] core: More guards in public functions

commit 7429149f96593318d67a81b5c91b162e7add4e82
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Mar 19 12:15:39 2014 +0100

    core: More guards in public functions
    
    And avoid C99 variable declarations.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=726698

 src/data/grl-config.c       |   39 ++++++++++++++++++---
 src/data/grl-media-audio.c  |   45 +++++++++++++++++++++---
 src/data/grl-media-box.c    |    6 ++-
 src/data/grl-media-image.c  |   20 +++++++++--
 src/data/grl-media-video.c  |   38 +++++++++++++++++---
 src/data/grl-media.c        |   80 +++++++++++++++++++++++++++++++++++-------
 src/data/grl-related-keys.c |   46 +++++++++++++++++++++----
 7 files changed, 231 insertions(+), 43 deletions(-)
---
diff --git a/src/data/grl-config.c b/src/data/grl-config.c
index d1b2dc1..1e48f63 100644
--- a/src/data/grl-config.c
+++ b/src/data/grl-config.c
@@ -104,11 +104,12 @@ grl_config_finalize (GObject *object)
 GrlConfig *
 grl_config_new (const gchar *plugin, const gchar *source)
 {
+  GrlConfig *config;
+
   g_return_val_if_fail (plugin != NULL, NULL);
-  GrlConfig *config = g_object_new (GRL_TYPE_CONFIG, NULL);
-  if (plugin) {
-    grl_config_set_string (config, GRL_CONFIG_KEY_PLUGIN, plugin);
-  }
+
+  config = g_object_new (GRL_TYPE_CONFIG, NULL);
+  grl_config_set_string (config, GRL_CONFIG_KEY_PLUGIN, plugin);
   if (source) {
     grl_config_set_source (config, source);
   }
@@ -132,6 +133,7 @@ grl_config_set (GrlConfig *config, const gchar *param, const GValue *value)
   gchar *encoded;
 
   g_return_if_fail (GRL_IS_CONFIG (config));
+  g_return_if_fail (param != NULL);
 
   switch (G_VALUE_TYPE (value)) {
   case G_TYPE_STRING:
@@ -181,6 +183,7 @@ grl_config_set (GrlConfig *config, const gchar *param, const GValue *value)
 void
 grl_config_set_string (GrlConfig *config, const gchar *param, const gchar *value)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
   g_key_file_set_string (config->priv->config, GROUP_NAME, param, value);
 }
 
@@ -197,6 +200,7 @@ grl_config_set_string (GrlConfig *config, const gchar *param, const gchar *value
 void
 grl_config_set_int (GrlConfig *config, const gchar *param, gint value)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
   g_key_file_set_integer (config->priv->config, GROUP_NAME, param, value);
 }
 
@@ -214,6 +218,7 @@ grl_config_set_int (GrlConfig *config, const gchar *param, gint value)
 void
 grl_config_set_float (GrlConfig *config, const gchar *param, gfloat value)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
   g_key_file_set_double (config->priv->config, GROUP_NAME, param, (gdouble) value);
 }
 
@@ -230,6 +235,7 @@ grl_config_set_float (GrlConfig *config, const gchar *param, gfloat value)
 void
 grl_config_set_boolean (GrlConfig *config, const gchar *param, gboolean value)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
   g_key_file_set_boolean (config->priv->config, GROUP_NAME, param, value);
 }
 
@@ -247,7 +253,11 @@ grl_config_set_boolean (GrlConfig *config, const gchar *param, gboolean value)
 void
 grl_config_set_binary (GrlConfig *config, const gchar *param, const guint8 *blob, gsize size)
 {
-  gchar *encoded = g_base64_encode (blob, size);
+  gchar *encoded;
+
+  g_return_if_fail (GRL_IS_CONFIG (config));
+
+  encoded = g_base64_encode (blob, size);
   g_key_file_set_string (config->priv->config, GROUP_NAME, param, encoded);
   g_free (encoded);
 }
@@ -365,6 +375,9 @@ grl_config_get_binary (GrlConfig *config, const gchar *param, gsize *size)
 void
 grl_config_set_plugin (GrlConfig *config, const gchar *plugin)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
+  g_return_if_fail (plugin != NULL);
+
   grl_config_set_string (GRL_CONFIG (config),
                          GRL_CONFIG_KEY_PLUGIN,
                          plugin);
@@ -382,6 +395,8 @@ grl_config_set_plugin (GrlConfig *config, const gchar *plugin)
 void
 grl_config_set_source (GrlConfig *config, const gchar *source)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
+
   grl_config_set_string (GRL_CONFIG (config),
                          GRL_CONFIG_KEY_SOURCE,
                          source);
@@ -399,6 +414,8 @@ grl_config_set_source (GrlConfig *config, const gchar *source)
 void
 grl_config_set_api_key (GrlConfig *config, const gchar *key)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
+
   grl_config_set_string (GRL_CONFIG (config),
                          GRL_CONFIG_KEY_APIKEY,
                          key);
@@ -417,6 +434,8 @@ grl_config_set_api_key (GrlConfig *config, const gchar *key)
 void
 grl_config_set_api_key_blob (GrlConfig *config, const guint8 *blob, gsize size)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
+
   grl_config_set_binary (config, GRL_CONFIG_KEY_APIKEY_BLOB, blob, size);
 }
 
@@ -432,6 +451,8 @@ grl_config_set_api_key_blob (GrlConfig *config, const guint8 *blob, gsize size)
 void
 grl_config_set_api_token (GrlConfig *config, const gchar *token)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
+
   grl_config_set_string (GRL_CONFIG (config),
                          GRL_CONFIG_KEY_APITOKEN,
                          token);
@@ -450,6 +471,8 @@ grl_config_set_api_token (GrlConfig *config, const gchar *token)
 void
 grl_config_set_api_token_secret (GrlConfig *config, const gchar *secret)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
+
   grl_config_set_string (GRL_CONFIG (config),
                          GRL_CONFIG_KEY_APITOKEN_SECRET,
                          secret);
@@ -468,6 +491,8 @@ grl_config_set_api_token_secret (GrlConfig *config, const gchar *secret)
 void
 grl_config_set_api_secret (GrlConfig *config, const gchar *secret)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
+
   grl_config_set_string (GRL_CONFIG (config),
                          GRL_CONFIG_KEY_APISECRET,
                          secret);
@@ -485,6 +510,8 @@ grl_config_set_api_secret (GrlConfig *config, const gchar *secret)
 void
 grl_config_set_username (GrlConfig *config, const gchar *username)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
+
   grl_config_set_string (GRL_CONFIG (config),
                          GRL_CONFIG_KEY_USERNAME,
                          username);
@@ -502,6 +529,8 @@ grl_config_set_username (GrlConfig *config, const gchar *username)
 void
 grl_config_set_password(GrlConfig *config, const gchar *password)
 {
+  g_return_if_fail (GRL_IS_CONFIG (config));
+
   grl_config_set_string (GRL_CONFIG (config),
                          GRL_CONFIG_KEY_PASSWORD,
                          password);
diff --git a/src/data/grl-media-audio.c b/src/data/grl-media-audio.c
index 83b4aa5..258aaba 100644
--- a/src/data/grl-media-audio.c
+++ b/src/data/grl-media-audio.c
@@ -86,6 +86,7 @@ grl_media_audio_new (void)
 void
 grl_media_audio_set_artist (GrlMediaAudio *audio, const gchar *artist)
 {
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
   grl_data_set_string (GRL_DATA (audio), GRL_METADATA_KEY_ARTIST,
                        artist);
 }
@@ -102,6 +103,7 @@ grl_media_audio_set_artist (GrlMediaAudio *audio, const gchar *artist)
 void
 grl_media_audio_set_album (GrlMediaAudio *audio, const gchar *album)
 {
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
   grl_data_set_string (GRL_DATA (audio), GRL_METADATA_KEY_ALBUM,
                        album);
 }
@@ -118,6 +120,7 @@ grl_media_audio_set_album (GrlMediaAudio *audio, const gchar *album)
 void
 grl_media_audio_set_genre (GrlMediaAudio *audio, const gchar *genre)
 {
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
   grl_data_set_string (GRL_DATA (audio), GRL_METADATA_KEY_GENRE,
                        genre);
 }
@@ -134,6 +137,7 @@ grl_media_audio_set_genre (GrlMediaAudio *audio, const gchar *genre)
 void
 grl_media_audio_set_lyrics (GrlMediaAudio *audio, const gchar *lyrics)
 {
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
   grl_data_set_string (GRL_DATA (audio), GRL_METADATA_KEY_LYRICS,
                        lyrics);
 }
@@ -150,6 +154,7 @@ grl_media_audio_set_lyrics (GrlMediaAudio *audio, const gchar *lyrics)
 void
 grl_media_audio_set_bitrate (GrlMediaAudio *audio, gint bitrate)
 {
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
   grl_data_set_int (GRL_DATA (audio), GRL_METADATA_KEY_BITRATE,
                     bitrate);
 }
@@ -164,6 +169,7 @@ grl_media_audio_set_bitrate (GrlMediaAudio *audio, gint bitrate)
 void
 grl_media_audio_set_track_number (GrlMediaAudio *audio, gint track_number)
 {
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
   grl_data_set_int (GRL_DATA (audio), GRL_METADATA_KEY_TRACK_NUMBER,
                     track_number);
 }
@@ -185,7 +191,11 @@ grl_media_audio_set_url_data (GrlMediaAudio *audio,
                               const gchar *mime,
                               gint bitrate)
 {
-  GrlRelatedKeys *relkeys = grl_related_keys_new ();
+  GrlRelatedKeys *relkeys;
+
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
+
+  relkeys = grl_related_keys_new ();
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_URL, url);
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_MIME, mime);
   if (bitrate >= 0) {
@@ -206,6 +216,7 @@ grl_media_audio_set_url_data (GrlMediaAudio *audio,
 void
 grl_media_audio_add_artist (GrlMediaAudio *audio, const gchar *artist)
 {
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
   grl_data_add_string (GRL_DATA (audio), GRL_METADATA_KEY_ARTIST, artist);
 }
 
@@ -221,6 +232,7 @@ grl_media_audio_add_artist (GrlMediaAudio *audio, const gchar *artist)
 void
 grl_media_audio_add_genre (GrlMediaAudio *audio, const gchar *genre)
 {
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
   grl_data_add_string (GRL_DATA (audio), GRL_METADATA_KEY_GENRE, genre);
 }
 
@@ -236,6 +248,7 @@ grl_media_audio_add_genre (GrlMediaAudio *audio, const gchar *genre)
 void
 grl_media_audio_add_lyrics (GrlMediaAudio *audio, const gchar *lyrics)
 {
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
   grl_data_add_string (GRL_DATA (audio), GRL_METADATA_KEY_LYRICS, lyrics);
 }
 
@@ -257,7 +270,11 @@ grl_media_audio_add_url_data (GrlMediaAudio *audio,
                               const gchar *mime,
                               gint bitrate)
 {
-  GrlRelatedKeys *relkeys = grl_related_keys_new ();
+  GrlRelatedKeys *relkeys;
+
+  g_return_if_fail (GRL_IS_MEDIA_AUDIO (audio));
+
+  relkeys = grl_related_keys_new ();
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_URL, url);
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_MIME, mime);
   if (bitrate >= 0) {
@@ -292,7 +309,11 @@ grl_media_audio_get_artist (GrlMediaAudio *audio)
 const gchar *
 grl_media_audio_get_artist_nth (GrlMediaAudio *audio, guint index)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA_AUDIO (audio), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (audio),
                                GRL_METADATA_KEY_ARTIST,
                                index);
@@ -344,7 +365,11 @@ grl_media_audio_get_genre (GrlMediaAudio *audio)
 const gchar *
 grl_media_audio_get_genre_nth (GrlMediaAudio *audio, guint index)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA_AUDIO (audio), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (audio), GRL_METADATA_KEY_GENRE, index);
 
   if (!relkeys) {
@@ -380,7 +405,11 @@ grl_media_audio_get_lyrics (GrlMediaAudio *audio)
 const gchar *
 grl_media_audio_get_lyrics_nth (GrlMediaAudio *audio, guint index)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA_AUDIO (audio), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (audio),
                                GRL_METADATA_KEY_LYRICS,
                                index);
@@ -454,7 +483,11 @@ grl_media_audio_get_url_data_nth (GrlMediaAudio *audio,
                                   gchar **mime,
                                   gint *bitrate)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA_AUDIO (audio), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (audio), GRL_METADATA_KEY_URL, index);
 
   if (!relkeys) {
diff --git a/src/data/grl-media-box.c b/src/data/grl-media-box.c
index 6c99bb3..e9b8152 100644
--- a/src/data/grl-media-box.c
+++ b/src/data/grl-media-box.c
@@ -128,11 +128,13 @@ grl_media_box_set_childcount (GrlMediaBox *box,
 gint
 grl_media_box_get_childcount (GrlMediaBox *box)
 {
+  const GValue *value;
+
   g_return_val_if_fail (GRL_IS_MEDIA_BOX (box),
                         GRL_METADATA_KEY_CHILDCOUNT_UNKNOWN);
 
-  const GValue *value = grl_data_get (GRL_DATA (box),
-                                      GRL_METADATA_KEY_CHILDCOUNT);
+  value = grl_data_get (GRL_DATA (box),
+                        GRL_METADATA_KEY_CHILDCOUNT);
 
   if (value) {
     return g_value_get_int (value);
diff --git a/src/data/grl-media-image.c b/src/data/grl-media-image.c
index 0d95ba8..e8ecf6a 100644
--- a/src/data/grl-media-image.c
+++ b/src/data/grl-media-image.c
@@ -89,6 +89,8 @@ grl_media_image_set_size (GrlMediaImage *image,
                           gint width,
                           gint height)
 {
+  g_return_if_fail (GRL_IS_MEDIA_IMAGE (image));
+
   grl_media_image_set_width (image, width);
   grl_media_image_set_height (image, height);
 }
@@ -146,7 +148,11 @@ grl_media_image_set_url_data (GrlMediaImage *image,
                               gint width,
                               gint height)
 {
-  GrlRelatedKeys *relkeys = grl_related_keys_new ();
+  GrlRelatedKeys *relkeys;
+
+  g_return_if_fail (GRL_IS_MEDIA_IMAGE (image));
+
+  relkeys = grl_related_keys_new ();
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_URL, url);
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_MIME, mime);
   if (width >= 0) {
@@ -178,7 +184,11 @@ grl_media_image_add_url_data (GrlMediaImage *image,
                               gint width,
                               gint height)
 {
-  GrlRelatedKeys *relkeys = grl_related_keys_new ();
+  GrlRelatedKeys *relkeys;
+
+  g_return_if_fail (GRL_IS_MEDIA_IMAGE (image));
+
+  relkeys = grl_related_keys_new ();
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_URL, url);
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_MIME, mime);
   if (width >= 0) {
@@ -258,7 +268,11 @@ grl_media_image_get_url_data_nth (GrlMediaImage *image,
                                   gint *width,
                                   gint *height)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA_IMAGE (image), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (image), GRL_METADATA_KEY_URL, index);
 
   if (!relkeys) {
diff --git a/src/data/grl-media-video.c b/src/data/grl-media-video.c
index 64782ec..d84544e 100644
--- a/src/data/grl-media-video.c
+++ b/src/data/grl-media-video.c
@@ -89,6 +89,8 @@ grl_media_video_set_size (GrlMediaVideo *video,
                           gint width,
                           int height)
 {
+  g_return_if_fail (GRL_IS_MEDIA_VIDEO (video));
+
   grl_media_video_set_width (video, width);
   grl_media_video_set_height (video, height);
 }
@@ -294,7 +296,11 @@ grl_media_video_set_url_data (GrlMediaVideo *video,
                               gint width,
                               gint height)
 {
-  GrlRelatedKeys *relkeys = grl_related_keys_new ();
+  GrlRelatedKeys *relkeys;
+
+  g_return_if_fail (GRL_IS_MEDIA_VIDEO (video));
+
+  relkeys = grl_related_keys_new ();
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_URL, url);
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_MIME, mime);
   if (framerate >= 0) {
@@ -331,7 +337,11 @@ grl_media_video_add_url_data (GrlMediaVideo *video,
                               gint width,
                               gint height)
 {
-  GrlRelatedKeys *relkeys = grl_related_keys_new ();
+  GrlRelatedKeys *relkeys;
+
+  g_return_if_fail (GRL_IS_MEDIA_VIDEO (video));
+
+  relkeys = grl_related_keys_new ();
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_URL, url);
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_MIME, mime);
   if (framerate >= 0) {
@@ -395,7 +405,11 @@ grl_media_video_get_url_data_nth (GrlMediaVideo *video,
                                   gint *width,
                                   gint *height)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA_VIDEO (video), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (video), GRL_METADATA_KEY_URL, index);
 
   if (!relkeys) {
@@ -487,7 +501,11 @@ const gchar *
 grl_media_video_get_performer_nth (GrlMediaVideo *video,
                                    guint index)
 {
-  GrlRelatedKeys *const relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA_VIDEO (video), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (video),
                                GRL_METADATA_KEY_PERFORMER,
                                index);
@@ -564,7 +582,11 @@ const gchar *
 grl_media_video_get_producer_nth (GrlMediaVideo *video,
                                   guint index)
 {
-  GrlRelatedKeys *const relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA_VIDEO (video), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (video),
                                GRL_METADATA_KEY_PRODUCER,
                                index);
@@ -641,7 +663,11 @@ const gchar *
 grl_media_video_get_director_nth (GrlMediaVideo *video,
                                   guint index)
 {
-  GrlRelatedKeys *const relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA_VIDEO (video), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (video),
                                GRL_METADATA_KEY_DIRECTOR,
                                index);
diff --git a/src/data/grl-media.c b/src/data/grl-media.c
index 7b3cd1e..5f6102a 100644
--- a/src/data/grl-media.c
+++ b/src/data/grl-media.c
@@ -99,7 +99,11 @@ grl_media_new (void)
 void
 grl_media_set_rating (GrlMedia *media, gfloat rating, gfloat max)
 {
-  gfloat normalized_value = (rating * RATING_MAX) / max;
+  gfloat normalized_value;
+
+  g_return_if_fail (GRL_IS_MEDIA (media));
+
+  normalized_value = (rating * RATING_MAX) / max;
   grl_data_set_float (GRL_DATA (media),
                      GRL_METADATA_KEY_RATING,
                      normalized_value);
@@ -118,7 +122,11 @@ grl_media_set_rating (GrlMedia *media, gfloat rating, gfloat max)
 void
 grl_media_set_url_data (GrlMedia *media, const gchar *url, const gchar *mime)
 {
-  GrlRelatedKeys *relkeys = grl_related_keys_new ();
+  GrlRelatedKeys *relkeys;
+
+  g_return_if_fail (GRL_IS_MEDIA (media));
+
+  relkeys = grl_related_keys_new ();
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_URL, url);
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_MIME, mime);
   grl_data_set_related_keys (GRL_DATA (media), relkeys, 0);
@@ -137,7 +145,11 @@ grl_media_set_url_data (GrlMedia *media, const gchar *url, const gchar *mime)
 void
 grl_media_add_url_data (GrlMedia *media, const gchar *url, const gchar *mime)
 {
-  GrlRelatedKeys *relkeys = grl_related_keys_new ();
+  GrlRelatedKeys *relkeys;
+
+  g_return_if_fail (GRL_IS_MEDIA (media));
+
+  relkeys = grl_related_keys_new ();
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_URL, url);
   grl_related_keys_set_string (relkeys, GRL_METADATA_KEY_MIME, mime);
   grl_data_add_related_keys (GRL_DATA (media), relkeys);
@@ -840,7 +852,12 @@ grl_media_set_region_data (GrlMedia *media,
                            const GDateTime *publication_date,
                            const gchar *certificate)
 {
-  GrlRelatedKeys *relkeys = grl_related_keys_new ();
+  GrlRelatedKeys *relkeys;
+
+  g_return_if_fail (GRL_IS_MEDIA (media));
+
+  relkeys = grl_related_keys_new ();
+
   grl_related_keys_set_string (relkeys,
                                GRL_METADATA_KEY_REGION,
                                region);
@@ -870,7 +887,11 @@ grl_media_add_region_data (GrlMedia *media,
                            const GDateTime *publication_date,
                            const gchar *certificate)
 {
-  GrlRelatedKeys *relkeys = grl_related_keys_new ();
+  GrlRelatedKeys *relkeys;
+
+  g_return_if_fail (GRL_IS_MEDIA (media));
+
+  relkeys = grl_related_keys_new ();
   grl_related_keys_set_string (relkeys,
                                GRL_METADATA_KEY_REGION,
                                region);
@@ -1184,8 +1205,11 @@ grl_media_get_url_data (GrlMedia *media, gchar **mime)
 const gchar *
 grl_media_get_url_data_nth (GrlMedia *media, guint index, gchar **mime)
 {
-  GrlRelatedKeys *relkeys =
-    grl_data_get_related_keys (GRL_DATA (media), GRL_METADATA_KEY_URL, index);
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA (media), NULL);
+
+  relkeys = grl_data_get_related_keys (GRL_DATA (media), GRL_METADATA_KEY_URL, index);
 
   if (!relkeys) {
     return NULL;
@@ -1225,7 +1249,11 @@ grl_media_get_author (GrlMedia *media)
 const gchar *
 grl_media_get_author_nth (GrlMedia *media, guint index)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA (media), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (media),
                                GRL_METADATA_KEY_AUTHOR,
                                index);
@@ -1305,7 +1333,11 @@ grl_media_get_thumbnail (GrlMedia *media)
 const gchar *
 grl_media_get_thumbnail_nth (GrlMedia *media, guint index)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA (media), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (media),
                                GRL_METADATA_KEY_THUMBNAIL,
                                index);
@@ -1348,7 +1380,11 @@ grl_media_get_thumbnail_binary (GrlMedia *media, gsize *size)
 const guint8 *
 grl_media_get_thumbnail_binary_nth (GrlMedia *media, gsize *size, guint index)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA (media), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (media),
                                GRL_METADATA_KEY_THUMBNAIL,
                                index);
@@ -1480,7 +1516,11 @@ grl_media_get_region_data_nth (GrlMedia *media,
                                const GDateTime **publication_date,
                                const gchar **certificate)
 {
-    GrlRelatedKeys *relkeys =
+    GrlRelatedKeys *relkeys;
+
+    g_return_val_if_fail (GRL_IS_MEDIA (media), NULL);
+
+    relkeys =
       grl_data_get_related_keys (GRL_DATA (media),
                                  GRL_METADATA_KEY_PUBLICATION_DATE,
                                  index);
@@ -1630,7 +1670,11 @@ grl_media_get_player(GrlMedia *media)
 const gchar *
 grl_media_get_player_nth (GrlMedia *media, guint index)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA (media), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (media),
                                GRL_METADATA_KEY_EXTERNAL_PLAYER,
                                index);
@@ -1670,7 +1714,11 @@ grl_media_get_external_url (GrlMedia *media)
 const gchar *
 grl_media_get_external_url_nth (GrlMedia *media, guint index)
 {
-  GrlRelatedKeys *relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA (media), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (media),
                                GRL_METADATA_KEY_EXTERNAL_URL,
                                index);
@@ -1786,7 +1834,11 @@ const gchar *
 grl_media_get_keyword_nth (GrlMedia *media,
                            guint index)
 {
-  GrlRelatedKeys *const relkeys =
+  GrlRelatedKeys *relkeys;
+
+  g_return_val_if_fail (GRL_IS_MEDIA (media), NULL);
+
+  relkeys =
     grl_data_get_related_keys (GRL_DATA (media),
                                GRL_METADATA_KEY_KEYWORD,
                                index);
diff --git a/src/data/grl-related-keys.c b/src/data/grl-related-keys.c
index aed5063..3a34df7 100644
--- a/src/data/grl-related-keys.c
+++ b/src/data/grl-related-keys.c
@@ -285,6 +285,8 @@ grl_related_keys_set_string (GrlRelatedKeys *relkeys,
 {
   GValue value = { 0 };
 
+  g_return_if_fail (GRL_IS_RELATED_KEYS (relkeys));
+
   if (strvalue) {
     g_value_init (&value, G_TYPE_STRING);
     g_value_set_string (&value, strvalue);
@@ -310,7 +312,11 @@ const gchar *
 grl_related_keys_get_string (GrlRelatedKeys *relkeys,
                              GrlKeyID key)
 {
-  const GValue *value = grl_related_keys_get (relkeys, key);
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_RELATED_KEYS (relkeys), NULL);
+
+  value = grl_related_keys_get (relkeys, key);
 
   if (!value || !G_VALUE_HOLDS_STRING (value)) {
     return NULL;
@@ -336,6 +342,7 @@ grl_related_keys_set_int (GrlRelatedKeys *relkeys,
                           gint intvalue)
 {
   GValue value = { 0 };
+  g_return_if_fail (GRL_IS_RELATED_KEYS (relkeys));
   g_value_init (&value, G_TYPE_INT);
   g_value_set_int (&value, intvalue);
   grl_related_keys_set (relkeys, key, &value);
@@ -357,7 +364,11 @@ gint
 grl_related_keys_get_int (GrlRelatedKeys *relkeys,
                           GrlKeyID key)
 {
-  const GValue *value = grl_related_keys_get (relkeys, key);
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_RELATED_KEYS (relkeys), 0);
+
+  value = grl_related_keys_get (relkeys, key);
 
   if (!value || !G_VALUE_HOLDS_INT (value)) {
     return 0;
@@ -383,6 +394,7 @@ grl_related_keys_set_float (GrlRelatedKeys *relkeys,
                             float floatvalue)
 {
   GValue value = { 0 };
+  g_return_if_fail (GRL_IS_RELATED_KEYS (relkeys));
   g_value_init (&value, G_TYPE_FLOAT);
   g_value_set_float (&value, floatvalue);
   grl_related_keys_set (relkeys, key, &value);
@@ -404,7 +416,11 @@ gfloat
 grl_related_keys_get_float (GrlRelatedKeys *relkeys,
                             GrlKeyID key)
 {
-  const GValue *value = grl_related_keys_get (relkeys, key);
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_RELATED_KEYS (relkeys), 0.0);
+
+  value = grl_related_keys_get (relkeys, key);
 
   if (!value || !G_VALUE_HOLDS_FLOAT (value)) {
     return 0;
@@ -430,6 +446,7 @@ grl_related_keys_set_boolean (GrlRelatedKeys *relkeys,
                               gboolean booleanvalue)
 {
   GValue value = { 0 };
+  g_return_if_fail (GRL_IS_RELATED_KEYS (relkeys));
   g_value_init (&value, G_TYPE_BOOLEAN);
   g_value_set_boolean (&value, booleanvalue);
   grl_related_keys_set (relkeys, key, &value);
@@ -452,7 +469,11 @@ gboolean
 grl_related_keys_get_boolean (GrlRelatedKeys *relkeys,
                               GrlKeyID key)
 {
-  const GValue *value = grl_related_keys_get (relkeys, key);
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_RELATED_KEYS (relkeys), NULL);
+
+  value = grl_related_keys_get (relkeys, key);
 
   if (!value || !G_VALUE_HOLDS_BOOLEAN (value)) {
     return FALSE;
@@ -482,6 +503,8 @@ grl_related_keys_set_binary (GrlRelatedKeys *relkeys,
   GValue v = { 0 };
   GByteArray *array;
 
+  g_return_if_fail (GRL_IS_RELATED_KEYS (relkeys));
+
   if (!buf || !size) {
     return;
   }
@@ -515,9 +538,13 @@ grl_related_keys_get_binary (GrlRelatedKeys *relkeys,
                              GrlKeyID key,
                              gsize *size)
 {
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_RELATED_KEYS (relkeys), NULL);
   g_return_val_if_fail (size, NULL);
 
-  const GValue *value = grl_related_keys_get (relkeys, key);
+  value = grl_related_keys_get (relkeys, key);
+
 
   if (!value || !G_VALUE_HOLDS_BOXED (value)) {
     return NULL;
@@ -548,6 +575,7 @@ grl_related_keys_set_boxed (GrlRelatedKeys *relkeys,
 {
   GValue value = { 0 };
 
+  g_return_if_fail (GRL_IS_RELATED_KEYS (relkeys));
   g_return_if_fail (boxed != NULL);
 
   g_value_init (&value, grl_metadata_key_get_type (key));
@@ -575,7 +603,11 @@ gconstpointer
 grl_related_keys_get_boxed (GrlRelatedKeys *relkeys,
                             GrlKeyID key)
 {
-  const GValue *value = grl_related_keys_get (relkeys, key);
+  const GValue *value;
+
+  g_return_val_if_fail (GRL_IS_RELATED_KEYS (relkeys), NULL);
+
+  value = grl_related_keys_get (relkeys, key);
 
   if (!value || !G_VALUE_HOLDS_BOXED (value)) {
     return NULL;
@@ -664,7 +696,7 @@ grl_related_keys_dup (GrlRelatedKeys *relkeys)
   GValue *value_copy;
   GrlRelatedKeys *dup_relkeys;
 
-  g_return_val_if_fail (relkeys, NULL);
+  g_return_val_if_fail (GRL_IS_RELATED_KEYS (relkeys), NULL);
 
   dup_relkeys = grl_related_keys_new ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]