Fix compiling with -Wall -Wextra

7 files changed, 29 insertions, 26 deletions

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);