From 3a7d632a595ba04a88b7894b19d7b8db4aae93a6 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 11 Mar 2010 15:38:18 +0100
Subject: [PATCH] Add -Wredundant-decls to warning flags

... and fix all the warnings that flag throws.
---
 configure.ac                        | 4 ++--
 ext/ogg/gstoggdemux.c               | 2 --
 ext/theora/gsttheoraparse.c         | 1 -
 ext/vorbis/gstvorbistag.c           | 4 ----
 gst/audioconvert/audioconvert.h     | 3 +++
 gst/audioconvert/gstaudioquantize.h | 3 ---
 gst/audioconvert/gstchannelmix.h    | 3 ---
 gst/playback/gstplaysink.c          | 5 ++---
 8 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 897e3c6..cd242ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,10 +308,10 @@ dnl set location of plugin directory
 AG_GST_SET_PLUGINDIR
 
 dnl define an ERROR_CFLAGS Makefile variable
-AG_GST_SET_ERROR_CFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes])
+AG_GST_SET_ERROR_CFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls])
 
 dnl define an ERROR_CXXFLAGS Makefile variable
-AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes])
+AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls])
 
 dnl define correct level for debugging messages
 AG_GST_SET_LEVEL_DEFAULT($GST_GIT)
diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 07ce75f..27e17d5 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -116,8 +116,6 @@ static gboolean gst_ogg_demux_perform_seek (GstOggDemux * ogg,
 static gboolean gst_ogg_demux_receive_event (GstElement * element,
     GstEvent * event);
 
-static void gst_ogg_pad_class_init (GstOggPadClass * klass);
-static void gst_ogg_pad_init (GstOggPad * pad);
 static void gst_ogg_pad_dispose (GObject * object);
 static void gst_ogg_pad_finalize (GObject * object);
 
diff --git a/ext/theora/gsttheoraparse.c b/ext/theora/gsttheoraparse.c
index 79c9007..8d5d9e2 100644
--- a/ext/theora/gsttheoraparse.c
+++ b/ext/theora/gsttheoraparse.c
@@ -101,7 +101,6 @@ static void theora_parse_get_property (GObject * object, guint prop_id,
 static void theora_parse_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 
-static gboolean theora_parse_src_query (GstPad * pad, GstQuery * query);
 static GstFlowReturn theora_parse_chain (GstPad * pad, GstBuffer * buffer);
 static GstStateChangeReturn theora_parse_change_state (GstElement * element,
     GstStateChange transition);
diff --git a/ext/vorbis/gstvorbistag.c b/ext/vorbis/gstvorbistag.c
index 67a931d..96368cf 100644
--- a/ext/vorbis/gstvorbistag.c
+++ b/ext/vorbis/gstvorbistag.c
@@ -60,10 +60,6 @@
 GST_DEBUG_CATEGORY_EXTERN (vorbisparse_debug);
 #define GST_CAT_DEFAULT vorbisparse_debug
 
-static void gst_vorbis_tag_base_init (gpointer g_class);
-static void gst_vorbis_tag_class_init (GstVorbisTagClass * klass);
-static void gst_vorbis_tag_init (GstVorbisTag * tagger,
-    GstVorbisTagClass * g_class);
 static GstFlowReturn gst_vorbis_tag_parse_packet (GstVorbisParse * parse,
     GstBuffer * buffer);
 
diff --git a/gst/audioconvert/audioconvert.h b/gst/audioconvert/audioconvert.h
index 98ce829..ccc4014 100644
--- a/gst/audioconvert/audioconvert.h
+++ b/gst/audioconvert/audioconvert.h
@@ -25,6 +25,9 @@
 #include <gst/gst.h>
 #include <gst/audio/multichannel.h>
 
+GST_DEBUG_CATEGORY_EXTERN (audio_convert_debug);
+#define GST_CAT_DEFAULT (audio_convert_debug)
+
 /**
  * GstAudioConvertDithering:
  * @DITHER_NONE: No dithering
diff --git a/gst/audioconvert/gstaudioquantize.h b/gst/audioconvert/gstaudioquantize.h
index a61003b..b7e5cce 100644
--- a/gst/audioconvert/gstaudioquantize.h
+++ b/gst/audioconvert/gstaudioquantize.h
@@ -23,9 +23,6 @@
 #include <gst/gst.h>
 #include "audioconvert.h"
 
-GST_DEBUG_CATEGORY_EXTERN (audio_convert_debug);
-#define GST_CAT_DEFAULT (audio_convert_debug)
-
 #ifndef __GST_AUDIO_QUANTIZE_H__
 #define __GST_AUDIO_QUANTIZE_H__
 
diff --git a/gst/audioconvert/gstchannelmix.h b/gst/audioconvert/gstchannelmix.h
index d046210..e02748e 100644
--- a/gst/audioconvert/gstchannelmix.h
+++ b/gst/audioconvert/gstchannelmix.h
@@ -25,9 +25,6 @@
 #include <gst/gst.h>
 #include "audioconvert.h"
 
-GST_DEBUG_CATEGORY_EXTERN (audio_convert_debug);
-#define GST_CAT_DEFAULT (audio_convert_debug)
-
 /*
  * Delete channel mixer matrix.
  */
diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c
index 13528c8..7ec1a7f 100644
--- a/gst/playback/gstplaysink.c
+++ b/gst/playback/gstplaysink.c
@@ -204,8 +204,6 @@ enum
   LAST_SIGNAL
 };
 
-static void gst_play_sink_class_init (GstPlaySinkClass * klass);
-static void gst_play_sink_init (GstPlaySink * playsink);
 static void gst_play_sink_dispose (GObject * object);
 static void gst_play_sink_finalize (GObject * object);
 static void gst_play_sink_set_property (GObject * object, guint prop_id,
@@ -2072,7 +2070,8 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
     if (playsink->textchain) {
       GST_DEBUG_OBJECT (playsink, "adding text chain");
       if (playsink->textchain->overlay)
-        g_object_set (G_OBJECT (playsink->textchain->overlay), "silent", FALSE, NULL);
+        g_object_set (G_OBJECT (playsink->textchain->overlay), "silent", FALSE,
+            NULL);
       add_chain (GST_PLAY_CHAIN (playsink->textchain), TRUE);
 
       gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (playsink->text_pad),
-- 
2.7.4