GNOME.org
 

[gupnp-av] Fix compiling with -Wall -Wextra

commit d4afdc68005c711e6d89386acf7bd74e5e776f3f
Author: Jens Georg <mail jensge org>
Date:   Thu May 30 11:38:29 2013 +0200

    Fix compiling with -Wall -Wextra

 libgupnp-av/gupnp-cds-last-change-parser.c |    4 ++--
 libgupnp-av/gupnp-didl-lite-container.c    |    2 +-
 libgupnp-av/gupnp-didl-lite-item.c         |    2 +-
 libgupnp-av/gupnp-didl-lite-parser.c       |    2 +-
 libgupnp-av/gupnp-didl-lite-resource.c     |    6 +++---
 libgupnp-av/gupnp-didl-lite-writer.c       |    5 ++---
 libgupnp-av/gupnp-feature-list-parser.c    |    9 +++++----
 libgupnp-av/gupnp-last-change-parser.c     |   12 ++++++------
 libgupnp-av/gupnp-media-collection.c       |    4 ++--
 tests/Makefile.am                          |    2 +-
 tests/check-feature-list-parser.c          |    2 +-
 tests/check-search.c                       |    4 ++--
 tests/gtest/test-cds-last-change-parser.c  |    3 ++-
 tests/gtest/test-media-collection.c        |   10 ++++++----
 tests/gtest/test-regression.c              |    6 +++---
 tests/test-search-criteria-parser.c        |   28 ++++++++++++++--------------
 16 files changed, 52 insertions(+), 49 deletions(-)
---
diff --git a/libgupnp-av/gupnp-cds-last-change-parser.c b/libgupnp-av/gupnp-cds-last-change-parser.c
index d51d385..71dbbea 100644
--- a/libgupnp-av/gupnp-cds-last-change-parser.c
+++ b/libgupnp-av/gupnp-cds-last-change-parser.c
@@ -59,12 +59,12 @@ G_DEFINE_BOXED_TYPE (GUPnPCDSLastChangeEntry,
                      gupnp_cds_last_change_entry_unref);
 
 static void
-gupnp_cds_last_change_parser_init (GUPnPCDSLastChangeParser *parser)
+gupnp_cds_last_change_parser_init (G_GNUC_UNUSED GUPnPCDSLastChangeParser *parser)
 {
 }
 
 static void
-gupnp_cds_last_change_parser_class_init (GUPnPCDSLastChangeParserClass *klass)
+gupnp_cds_last_change_parser_class_init (G_GNUC_UNUSED GUPnPCDSLastChangeParserClass *klass)
 {
 }
 
diff --git a/libgupnp-av/gupnp-didl-lite-container.c b/libgupnp-av/gupnp-didl-lite-container.c
index c21643a..b817863 100644
--- a/libgupnp-av/gupnp-didl-lite-container.c
+++ b/libgupnp-av/gupnp-didl-lite-container.c
@@ -53,7 +53,7 @@ enum {
 };
 
 static void
-gupnp_didl_lite_container_init (GUPnPDIDLLiteContainer *container)
+gupnp_didl_lite_container_init (G_GNUC_UNUSED GUPnPDIDLLiteContainer *container)
 {
         /* Nothing to initialize, yay! */
 }
diff --git a/libgupnp-av/gupnp-didl-lite-item.c b/libgupnp-av/gupnp-didl-lite-item.c
index ab38cb6..f007f9b 100644
--- a/libgupnp-av/gupnp-didl-lite-item.c
+++ b/libgupnp-av/gupnp-didl-lite-item.c
@@ -44,7 +44,7 @@ enum {
 };
 
 static void
-gupnp_didl_lite_item_init (GUPnPDIDLLiteItem *item)
+gupnp_didl_lite_item_init (G_GNUC_UNUSED GUPnPDIDLLiteItem *item)
 {
         /* Nothing to initialize, yay! */
 }
diff --git a/libgupnp-av/gupnp-didl-lite-parser.c b/libgupnp-av/gupnp-didl-lite-parser.c
index 086c2cc..bbf5c25 100644
--- a/libgupnp-av/gupnp-didl-lite-parser.c
+++ b/libgupnp-av/gupnp-didl-lite-parser.c
@@ -87,7 +87,7 @@ parse_elements (GUPnPDIDLLiteParser *parser,
                 GError             **error);
 
 static void
-gupnp_didl_lite_parser_init (GUPnPDIDLLiteParser *parser)
+gupnp_didl_lite_parser_init (G_GNUC_UNUSED GUPnPDIDLLiteParser *parser)
 {
 }
 
diff --git a/libgupnp-av/gupnp-didl-lite-resource.c b/libgupnp-av/gupnp-didl-lite-resource.c
index 041976a..754548d 100644
--- a/libgupnp-av/gupnp-didl-lite-resource.c
+++ b/libgupnp-av/gupnp-didl-lite-resource.c
@@ -105,9 +105,9 @@ return_point:
 }
 
 static void
-on_protocol_info_changed (GUPnPProtocolInfo *info,
-                          GParamSpec        *pspec,
-                          gpointer           user_data)
+on_protocol_info_changed (GUPnPProtocolInfo        *info,
+                          G_GNUC_UNUSED GParamSpec *pspec,
+                          gpointer                  user_data)
 {
         GUPnPDIDLLiteResource *resource = GUPNP_DIDL_LITE_RESOURCE (user_data);
 
diff --git a/libgupnp-av/gupnp-didl-lite-writer.c b/libgupnp-av/gupnp-didl-lite-writer.c
index 82da073..bd57138 100644
--- a/libgupnp-av/gupnp-didl-lite-writer.c
+++ b/libgupnp-av/gupnp-didl-lite-writer.c
@@ -184,8 +184,7 @@ is_standard_prop (const char *name,
 
 static void
 filter_attributes (xmlNode             *node,
-                   GList               *allowed,
-                   GUPnPDIDLLiteWriter *writer)
+                   GList               *allowed)
 {
         xmlAttr *attr;
         GList   *forbidden = NULL;
@@ -219,7 +218,7 @@ filter_node (xmlNode             *node,
         const char *container_class = NULL;
 
         if (!tags_only)
-                filter_attributes (node, allowed, writer);
+                filter_attributes (node, allowed);
 
         if (strcmp ((const char *) node->name, "container") == 0) {
             is_container = TRUE;
diff --git a/libgupnp-av/gupnp-feature-list-parser.c b/libgupnp-av/gupnp-feature-list-parser.c
index 0f69277..02d49c4 100644
--- a/libgupnp-av/gupnp-feature-list-parser.c
+++ b/libgupnp-av/gupnp-feature-list-parser.c
@@ -39,7 +39,7 @@ G_DEFINE_TYPE (GUPnPFeatureListParser,
                G_TYPE_OBJECT);
 
 static void
-gupnp_feature_list_parser_init (GUPnPFeatureListParser *parser)
+gupnp_feature_list_parser_init (G_GNUC_UNUSED GUPnPFeatureListParser *parser)
 {
         /* Nothing to do here */
 }
@@ -118,9 +118,10 @@ get_feature_object_ids (xmlNode *feature)
  * features or %NULL if an error occured.
  **/
 GList *
-gupnp_feature_list_parser_parse_text (GUPnPFeatureListParser *parser,
-                                      const char             *text,
-                                      GError                **error)
+gupnp_feature_list_parser_parse_text
+                                 (G_GNUC_UNUSED GUPnPFeatureListParser *parser,
+                                  const char             *text,
+                                  GError                **error)
 {
         xmlDoc       *doc;
         xmlNode      *element;
diff --git a/libgupnp-av/gupnp-last-change-parser.c b/libgupnp-av/gupnp-last-change-parser.c
index cddddd8..583d927 100644
--- a/libgupnp-av/gupnp-last-change-parser.c
+++ b/libgupnp-av/gupnp-last-change-parser.c
@@ -42,7 +42,7 @@ G_DEFINE_TYPE (GUPnPLastChangeParser,
                G_TYPE_OBJECT);
 
 static void
-gupnp_last_change_parser_init (GUPnPLastChangeParser *parser)
+gupnp_last_change_parser_init (G_GNUC_UNUSED GUPnPLastChangeParser *parser)
 {
 }
 
@@ -147,11 +147,11 @@ gupnp_last_change_parser_new (void)
  **/
 gboolean
 gupnp_last_change_parser_parse_last_change_valist
-                                       (GUPnPLastChangeParser *parser,
-                                        guint                  instance_id,
-                                        const char            *last_change_xml,
-                                        GError               **error,
-                                        va_list                var_args)
+                         (G_GNUC_UNUSED GUPnPLastChangeParser *parser,
+                          guint                                instance_id,
+                          const char                          *last_change_xml,
+                          GError                             **error,
+                          va_list                              var_args)
 {
         const char *variable_name;
         xmlDoc  *doc;
diff --git a/libgupnp-av/gupnp-media-collection.c b/libgupnp-av/gupnp-media-collection.c
index e04931e..4385116 100644
--- a/libgupnp-av/gupnp-media-collection.c
+++ b/libgupnp-av/gupnp-media-collection.c
@@ -82,7 +82,7 @@ reparent_children (GUPnPMediaCollection *collection)
 static void
 on_container_available (GUPnPMediaCollection   *self,
                         GUPnPDIDLLiteContainer *container,
-                        gpointer                user_data)
+                        G_GNUC_UNUSED gpointer  user_data)
 {
         /* According to media format spec, there's only one container allowed;
          * We allow any number of containers, but only the last one wins. */
@@ -95,7 +95,7 @@ on_container_available (GUPnPMediaCollection   *self,
 static void
 on_item_available (GUPnPMediaCollection   *self,
                    GUPnPDIDLLiteItem      *item,
-                   gpointer                user_data)
+                   G_GNUC_UNUSED gpointer  user_data)
 {
         self->priv->items = g_list_prepend (self->priv->items,
                                             g_object_ref (item));
diff --git a/tests/Makefile.am b/tests/Makefile.am
index de27f44..cac3776 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = gtest
 
 common_cflags = \
        $(LIBGUPNP_CFLAGS) \
-       -I$(top_srcdir)
+       -I$(top_srcdir) -Wno-unused-parameters
 common_ldadd = \
        $(top_builddir)/libgupnp-av/libgupnp-av-1.0.la \
        $(LIBGUPNP_LIBS)
diff --git a/tests/check-feature-list-parser.c b/tests/check-feature-list-parser.c
index 990920d..06014ab 100644
--- a/tests/check-feature-list-parser.c
+++ b/tests/check-feature-list-parser.c
@@ -75,7 +75,7 @@ check_feature (GUPnPFeature *feature)
 }
 
 int
-main (int argc, char **argv)
+main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
 {
         GUPnPFeatureListParser *parser;
         GError                 *error;
diff --git a/tests/check-search.c b/tests/check-search.c
index 7916912..ebbf502 100644
--- a/tests/check-search.c
+++ b/tests/check-search.c
@@ -30,11 +30,11 @@ static const char * const searches[] = {
 };
 
 int
-main (int argc, char **argv)
+main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
 {
         GUPnPSearchCriteriaParser *parser;
         GError *error;
-        int i;
+        guint i;
 
 #if !GLIB_CHECK_VERSION (2, 35, 0)
         g_type_init ();
diff --git a/tests/gtest/test-cds-last-change-parser.c b/tests/gtest/test-cds-last-change-parser.c
index 7ddf6cb..953f810 100644
--- a/tests/gtest/test-cds-last-change-parser.c
+++ b/tests/gtest/test-cds-last-change-parser.c
@@ -20,6 +20,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <libgupnp-av/gupnp-cds-last-change-parser.h>
 
@@ -395,7 +396,7 @@ TestReference test_reference_data[] = {
 static void
 compare_entries (const char *file, GList *entries)
 {
-        int reference_size, i, j;
+        guint reference_size, i, j;
         GList *it = entries;
 
         reference_size = G_N_ELEMENTS (test_reference_data);
diff --git a/tests/gtest/test-media-collection.c b/tests/gtest/test-media-collection.c
index 0979f0e..6e3df75 100644
--- a/tests/gtest/test-media-collection.c
+++ b/tests/gtest/test-media-collection.c
@@ -19,6 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <string.h>
+
 #include <libgupnp-av/gupnp-media-collection.h>
 
 /* Flat DIDL_S playlist */
@@ -275,10 +277,10 @@ test_didl_collection_parse_full ()
 #define ERROR_MESSAGE "Failed to parse DIDL-Lite: No 'DIDL-Lite' node in the DIDL-Lite XML:"
 
 static gboolean
-ignore_xml_parse_error (const gchar *log_domain,
-                        GLogLevelFlags log_level,
-                        const gchar *message,
-                        gpointer user_data)
+ignore_xml_parse_error (G_GNUC_UNUSED const gchar   *log_domain,
+                        G_GNUC_UNUSED GLogLevelFlags log_level,
+                        const gchar                 *message,
+                        G_GNUC_UNUSED gpointer       user_data)
 {
         if (strncmp (message,
                      ERROR_MESSAGE,
diff --git a/tests/gtest/test-regression.c b/tests/gtest/test-regression.c
index ed548e3..328d5dd 100644
--- a/tests/gtest/test-regression.c
+++ b/tests/gtest/test-regression.c
@@ -42,9 +42,9 @@
 "</DIDL-Lite>"
 
 static void
-test_bgo674319_on_object_available (GUPnPDIDLLiteParser *parser,
-                                    GUPnPDIDLLiteObject *object,
-                                    gpointer             user_data)
+test_bgo674319_on_object_available (G_GNUC_UNUSED GUPnPDIDLLiteParser *parser,
+                                    GUPnPDIDLLiteObject               *object,
+                                    gpointer                           user_data)
 {
         GUPnPDIDLLiteObject **out = (GUPnPDIDLLiteObject **) user_data;
         *out = g_object_ref (object);
diff --git a/tests/test-search-criteria-parser.c b/tests/test-search-criteria-parser.c
index 7e49fba..101b4bd 100644
--- a/tests/test-search-criteria-parser.c
+++ b/tests/test-search-criteria-parser.c
@@ -23,40 +23,40 @@
 #include <stdlib.h>
 
 static void
-begin_parens_cb (GUPnPSearchCriteriaParser *parser,
-                 gpointer                   user_data)
+begin_parens_cb (G_GNUC_UNUSED GUPnPSearchCriteriaParser *parser,
+                 G_GNUC_UNUSED gpointer                   user_data)
 {
         g_print ("(");
 }
 
 static void
-end_parens_cb (GUPnPSearchCriteriaParser *parser,
-               gpointer                   user_data)
+end_parens_cb (G_GNUC_UNUSED GUPnPSearchCriteriaParser *parser,
+               G_GNUC_UNUSED gpointer                   user_data)
 {
         g_print (")");
 }
 
 static void
-conjunction_cb (GUPnPSearchCriteriaParser *parser,
-                gpointer                   user_data)
+conjunction_cb (G_GNUC_UNUSED GUPnPSearchCriteriaParser *parser,
+                G_GNUC_UNUSED gpointer                   user_data)
 {
         g_print (" and ");
 }
 
 static void
-disjunction_cb (GUPnPSearchCriteriaParser *parser,
-                gpointer                   user_data)
+disjunction_cb (G_GNUC_UNUSED GUPnPSearchCriteriaParser *parser,
+                G_GNUC_UNUSED gpointer                   user_data)
 {
         g_print (" or ");
 }
 
 static gboolean
-expression_cb (GUPnPSearchCriteriaParser *parser,
-               const char                *property,
-               GUPnPSearchCriteriaOp      op,
-               const char                *value,
-               GError                   **error,
-               gpointer                   user_data)
+expression_cb (G_GNUC_UNUSED GUPnPSearchCriteriaParser *parser,
+               const char                              *property,
+               GUPnPSearchCriteriaOp                    op,
+               const char                              *value,
+               G_GNUC_UNUSED GError                   **error,
+               G_GNUC_UNUSED gpointer                   user_data)
 {
         g_print ("%s %d %s", property, op, value);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]