Misc code fixes

After noticing that I was building the project without -Wall
activated, this cleans several of the warnings found

There are still warnings related to the mixed use of xmlChar and gchar

diff --git a/src/mvs-minfo-provider-service.c b/src/mvs-minfo-provider-service.c
index ee82f3b..43b67a9 100644 (file)
--- a/src/mvs-minfo-provider-service.c
+++ b/src/mvs-minfo-provider-service.c
@@ -72,9 +72,8 @@ response_received_cb (MvsMInfoProvider *provider, guint service, GList *list,
                       gpointer user_data)
 {
         MvsMInfoProviderService *self = MVS_MINFO_PROVIDER_SERVICE (user_data);
                       gpointer user_data)
 {
         MvsMInfoProviderService *self = MVS_MINFO_PROVIDER_SERVICE (user_data);

-        GError *error = NULL;

         GList *iter = NULL;
         GList *iter = NULL;

-        gchar  **object_paths= g_new0 (gchar*, g_list_length (list) + 1);
+        gchar **object_paths= g_new0 (gchar*, g_list_length (list) + 1);

         gchar *movie_interface = NULL;
         guint i = 0;
 
         gchar *movie_interface = NULL;
         guint i = 0;
 

@@ -82,6 +81,9 @@ response_received_cb (MvsMInfoProvider *provider, guint service, GList *list,
                         g_strdup (TMDB_MOVIE_INTERFACE):
                         g_strdup (WATC_MOVIE_INTERFACE);
 
                         g_strdup (TMDB_MOVIE_INTERFACE):
                         g_strdup (WATC_MOVIE_INTERFACE);
 

+        /* TODO We left the movie var unused to keep a warning
+         * remembering that DBus objects aren't being freed
+         * when they aren't needed anymore */

         for (iter = list; iter; iter = iter->next) {
                 if (MVS_IS_TMDB_MOVIE (iter->data)) {
                         MvsTmdbMovie *tmdb_movie = MVS_TMDB_MOVIE (iter->data);
         for (iter = list; iter; iter = iter->next) {
                 if (MVS_IS_TMDB_MOVIE (iter->data)) {
                         MvsTmdbMovie *tmdb_movie = MVS_TMDB_MOVIE (iter->data);

diff --git a/src/mvs-minfo-provider.c b/src/mvs-minfo-provider.c
index 48db5cb..63b6687 100644 (file)
--- a/src/mvs-minfo-provider.c
+++ b/src/mvs-minfo-provider.c
@@ -160,11 +160,13 @@ create_tmdb_image (xmlNodePtr node)
          * id="4bc91...e007304"/> */
 
         for (i = 0; i < LAST_FIELD; i ++) {
          * id="4bc91...e007304"/> */
 
         for (i = 0; i < LAST_FIELD; i ++) {

-              value = xmlGetProp (node, image_fields[i]);

 
 

-              g_object_set (image, image_fields[i], value, NULL);
+                const gchar *image_field = mvs_tmdb_image_get_field (i);

 
 

-              g_free (value);
+                value = xmlGetProp (node, image_field);
+                g_object_set (image, image_field, value, NULL);
+
+                g_free (value);

         }
 
         return image;
         }
 
         return image;

@@ -234,7 +236,7 @@ parse_xml (const char *xml_data, goffset length)
                         NULL,
                         NULL,
                         XML_PARSE_NOBLANKS | XML_PARSE_RECOVER);
                         NULL,
                         NULL,
                         XML_PARSE_NOBLANKS | XML_PARSE_RECOVER);

-        g_return_if_fail (document);
+        g_return_val_if_fail (document, NULL);

 
         xmlXPathContextPtr context_ptr = xmlXPathNewContext (document);
 
 
         xmlXPathContextPtr context_ptr = xmlXPathNewContext (document);
 

diff --git a/src/mvs-tmdb-image.c b/src/mvs-tmdb-image.c
index 31f5a2e..44662db 100644 (file)
--- a/src/mvs-tmdb-image.c
+++ b/src/mvs-tmdb-image.c
@@ -42,6 +42,9 @@ struct _MvsTmdbImagePrivate {
         gchar *id;
 };
 
         gchar *id;
 };
 

+static const gchar*
+image_fields[LAST_FIELD] = { "type", "url", "size", "id" };
+

 static void
 mvs_tmdb_image_get_property (GObject *object, guint property_id,
                          GValue *value, GParamSpec *pspec)
 static void
 mvs_tmdb_image_get_property (GObject *object, guint property_id,
                          GValue *value, GParamSpec *pspec)

@@ -195,7 +198,7 @@ mvs_tmdb_image_new ()
 gboolean
 mvs_tmdb_image_set_imagetype (MvsTmdbImage *self, const gchar *type)
 {
 gboolean
 mvs_tmdb_image_set_imagetype (MvsTmdbImage *self, const gchar *type)
 {

-        g_return_val_if_fail(MVS_TMDB_IMAGE (self), FALSE);
+        g_return_val_if_fail (MVS_TMDB_IMAGE (self), FALSE);

 
         g_free (self->priv->type);
 
 
         g_free (self->priv->type);
 

@@ -213,7 +216,7 @@ mvs_tmdb_image_get_imagetype (MvsTmdbImage *self)
 gboolean
 mvs_tmdb_image_set_url (MvsTmdbImage *self, const gchar *url)
 {
 gboolean
 mvs_tmdb_image_set_url (MvsTmdbImage *self, const gchar *url)
 {

-        g_return_val_if_fail(MVS_TMDB_IMAGE (self), FALSE);
+        g_return_val_if_fail (MVS_TMDB_IMAGE (self), FALSE);

 
         g_free (self->priv->url);
 
 
         g_free (self->priv->url);
 

@@ -231,7 +234,7 @@ mvs_tmdb_image_get_url (MvsTmdbImage *self)
 gboolean
 mvs_tmdb_image_set_size (MvsTmdbImage *self, const gchar *size)
 {
 gboolean
 mvs_tmdb_image_set_size (MvsTmdbImage *self, const gchar *size)
 {

-        g_return_val_if_fail(MVS_TMDB_IMAGE (self), FALSE);
+        g_return_val_if_fail (MVS_TMDB_IMAGE (self), FALSE);

 
         g_free (self->priv->size);
 
 
         g_free (self->priv->size);
 

@@ -249,7 +252,7 @@ mvs_tmdb_image_get_size (MvsTmdbImage *self)
 gboolean
 mvs_tmdb_image_set_id (MvsTmdbImage *self, const gchar *id)
 {
 gboolean
 mvs_tmdb_image_set_id (MvsTmdbImage *self, const gchar *id)
 {

-        g_return_val_if_fail(MVS_TMDB_IMAGE (self), FALSE);
+        g_return_val_if_fail (MVS_TMDB_IMAGE (self), FALSE);

 
         g_free (self->priv->id);
 
 
         g_free (self->priv->id);
 

@@ -267,7 +270,7 @@ mvs_tmdb_image_get_id (MvsTmdbImage *self)
 gboolean
 mvs_tmdb_image_set_width (MvsTmdbImage *self, gint width)
 {
 gboolean
 mvs_tmdb_image_set_width (MvsTmdbImage *self, gint width)
 {

-        g_return_val_if_fail(MVS_TMDB_IMAGE (self), FALSE);
+        g_return_val_if_fail (MVS_TMDB_IMAGE (self), FALSE);

 
         self->priv->width = width;
 
 
         self->priv->width = width;
 

@@ -283,7 +286,7 @@ mvs_tmdb_image_get_width (MvsTmdbImage *self)
 gboolean
 mvs_tmdb_image_set_height (MvsTmdbImage *self, gint height)
 {
 gboolean
 mvs_tmdb_image_set_height (MvsTmdbImage *self, gint height)
 {

-        g_return_val_if_fail(MVS_TMDB_IMAGE (self), FALSE);
+        g_return_val_if_fail (MVS_TMDB_IMAGE (self), FALSE);

 
         self->priv->height = height;
 
 
         self->priv->height = height;
 

@@ -308,3 +311,11 @@ mvs_tmdb_image_print (MvsTmdbImage *self)
                 g_free (value);
         }
 }
                 g_free (value);
         }
 }

+
+const gchar*
+mvs_tmdb_image_get_field (int field)
+{
+        g_return_val_if_fail (field >= 0 && field < LAST_FIELD, NULL);
+
+        return image_fields[field];
+}

diff --git a/src/mvs-tmdb-image.h b/src/mvs-tmdb-image.h
index 1743643..4f90d2e 100644 (file)
--- a/src/mvs-tmdb-image.h
+++ b/src/mvs-tmdb-image.h
@@ -56,9 +56,6 @@ enum {
         LAST_FIELD
 };
 
         LAST_FIELD
 };
 

-static const gchar*
-image_fields[LAST_FIELD] = { "type", "url", "size", "id" };
-

 GType mvs_tmdb_image_get_type (void);
 
 MvsTmdbImage* mvs_tmdb_image_new ();
 GType mvs_tmdb_image_get_type (void);
 
 MvsTmdbImage* mvs_tmdb_image_new ();

@@ -102,6 +99,9 @@ mvs_tmdb_image_get_id (MvsTmdbImage *self);
 void
 mvs_tmdb_image_print (MvsTmdbImage *self);
 
 void
 mvs_tmdb_image_print (MvsTmdbImage *self);
 

+const gchar*
+mvs_tmdb_image_get_field (int field);
+

 G_END_DECLS
 
 #endif /* _MVS_TMDB_IMAGE */
 G_END_DECLS
 
 #endif /* _MVS_TMDB_IMAGE */

diff --git a/src/mvs-watc-movie.c b/src/mvs-watc-movie.c
index 3de9021..397c8e6 100644 (file)
--- a/src/mvs-watc-movie.c
+++ b/src/mvs-watc-movie.c
@@ -244,6 +244,8 @@ mvs_watc_movie_set_year (MvsWatcMovie *self, const gchar *year)
         g_free (self->priv->year);
 
         self->priv->year = g_strdup (year);
         g_free (self->priv->year);
 
         self->priv->year = g_strdup (year);

+
+        return self->priv->year != NULL;

 }
 
 const gchar*
 }
 
 const gchar*

diff --git a/src/mvs-watc-movie.h b/src/mvs-watc-movie.h
index ac0aa6b..d80a7ed 100644 (file)
--- a/src/mvs-watc-movie.h
+++ b/src/mvs-watc-movie.h
@@ -69,7 +69,7 @@ gboolean
 mvs_watc_movie_set_stingers (MvsWatcMovie *self, int stingers);
 
 gint
 mvs_watc_movie_set_stingers (MvsWatcMovie *self, int stingers);
 
 gint

-mvs_watch_movie_get_stingers (MvsWatcMovie *self);
+mvs_watc_movie_get_stingers (MvsWatcMovie *self);

 
 gboolean
 mvs_watc_movie_set_year (MvsWatcMovie *self, const gchar *year);
 
 gboolean
 mvs_watc_movie_set_year (MvsWatcMovie *self, const gchar *year);

@@ -78,7 +78,7 @@ const gchar*
 mvs_watc_movie_get_year (MvsWatcMovie *self);
 
 void
 mvs_watc_movie_get_year (MvsWatcMovie *self);
 
 void

-mvs_watch_movie_print (MvsWatcMovie *self);
+mvs_watc_movie_print (MvsWatcMovie *self);

 
 G_END_DECLS
 
 
 G_END_DECLS