From b7655bbd2ef5f07cb7079a223aedaecdbc05e111 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 22 Mar 2010 12:02:16 +0100
Subject: Add -Wredundant-decls flag

and fix warnings from it
---
 configure.ac                     |  4 ++--
 ext/apexsink/gstapexsink.c       |  5 -----
 ext/cdaudio/gstcdaudio.c         |  2 --
 ext/dc1394/gstdc1394.c           |  2 --
 ext/jp2k/gstjasperdec.c          |  5 -----
 ext/jp2k/gstjasperenc.c          |  5 -----
 ext/kate/gstkatetag.c            |  3 ---
 ext/metadata/gstmetadatademux.c  |  8 --------
 ext/metadata/gstmetadatamux.c    |  7 -------
 ext/metadata/metadataparseutil.h |  9 ---------
 ext/timidity/gsttimidity.c       |  3 ---
 ext/timidity/gstwildmidi.c       |  2 --
 gst/camerabin/gstcamerabin.c     | 10 +---------
 gst/cdxaparse/gstcdxaparse.c     |  1 -
 gst/dtmf/gstrtpdtmfsrc.c         |  4 ----
 gst/freeze/gstfreeze.c           |  1 -
 gst/jpegformat/gstjifmux.c       |  2 --
 gst/jpegformat/gstjpegparse.c    |  2 --
 gst/librfb/gstrfbsrc.c           |  2 --
 gst/mpegdemux/mpegtspacketizer.c |  2 --
 gst/pnm/gstpnmdec.c              |  4 ++--
 gst/pnm/gstpnmenc.c              |  4 ++--
 gst/sdp/gstsdpdemux.c            |  1 -
 gst/subenc/gstsrtenc.c           |  3 ---
 24 files changed, 7 insertions(+), 84 deletions(-)

diff --git a/configure.ac b/configure.ac
index 606f740b1..08895d406 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,11 +240,11 @@ AG_GST_SET_PLUGINDIR
 
 dnl define an ERROR_CFLAGS Makefile variable
 AG_GST_SET_ERROR_CFLAGS($GST_GIT, [
-    -Wmissing-declarations -Wmissing-prototypes ])
+    -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls ])
 
 dnl define an ERROR_CXXFLAGS Makefile variable
 AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [
-    -Wmissing-declarations ])
+    -Wmissing-declarations -Wredundant-decls ])
 
 dnl define correct level for debugging messages
 AG_GST_SET_LEVEL_DEFAULT($GST_GIT)
diff --git a/ext/apexsink/gstapexsink.c b/ext/apexsink/gstapexsink.c
index 72d505a22..bf73bd2df 100644
--- a/ext/apexsink/gstapexsink.c
+++ b/ext/apexsink/gstapexsink.c
@@ -109,11 +109,6 @@ gst_apexsink_jacktype_get_type (void)
 }
 
 
-static void gst_apexsink_base_init (gpointer g_class);
-static void gst_apexsink_class_init (GstApExSinkClass * klass);
-static void gst_apexsink_init (GstApExSink * apexsink,
-    GstApExSinkClass * g_class);
-
 static void gst_apexsink_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_apexsink_get_property (GObject * object, guint prop_id,
diff --git a/ext/cdaudio/gstcdaudio.c b/ext/cdaudio/gstcdaudio.c
index 4dd46190c..4eb113f02 100644
--- a/ext/cdaudio/gstcdaudio.c
+++ b/ext/cdaudio/gstcdaudio.c
@@ -91,8 +91,6 @@ enum
   LAST_SIGNAL
 };
 
-static void gst_cdaudio_class_init (GstCDAudioClass * klass);
-static void gst_cdaudio_init (GstCDAudio * cdaudio, GstCDAudioClass * g_class);
 static void gst_cdaudio_finalize (GObject * object);
 
 static void gst_cdaudio_set_property (GObject * object, guint prop_id,
diff --git a/ext/dc1394/gstdc1394.c b/ext/dc1394/gstdc1394.c
index 583570762..6ce9c80e4 100644
--- a/ext/dc1394/gstdc1394.c
+++ b/ext/dc1394/gstdc1394.c
@@ -89,8 +89,6 @@ static void gst_dc1394_set_caps_framesize_range (GstStructure * gs,
 
 static gint gst_dc1394_caps_set_framerate_list (GstStructure * gs,
     dc1394framerates_t * framerates);
-static void gst_dc1394_framerate_const_to_frac (int framerateconst,
-    GValue * framefrac);
 
 static GstCaps *gst_dc1394_get_all_dc1394_caps (void);
 static GstCaps *gst_dc1394_get_cam_caps (GstDc1394 * src);
diff --git a/ext/jp2k/gstjasperdec.c b/ext/jp2k/gstjasperdec.c
index 73662c014..61ba18d2c 100644
--- a/ext/jp2k/gstjasperdec.c
+++ b/ext/jp2k/gstjasperdec.c
@@ -68,11 +68,6 @@ static GstStaticPadTemplate gst_jasper_dec_src_template =
         GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, Y41B, Y42B }"))
     );
 
-static void gst_jasper_dec_base_init (gpointer g_class);
-static void gst_jasper_dec_class_init (GstJasperDecClass * klass);
-static void gst_jasper_dec_init (GstJasperDec * filter,
-    GstJasperDecClass * klass);
-
 static void gst_jasper_dec_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_jasper_dec_get_property (GObject * object, guint prop_id,
diff --git a/ext/jp2k/gstjasperenc.c b/ext/jp2k/gstjasperenc.c
index 870ebd691..7c923a413 100644
--- a/ext/jp2k/gstjasperenc.c
+++ b/ext/jp2k/gstjasperenc.c
@@ -65,11 +65,6 @@ static GstStaticPadTemplate gst_jasper_enc_src_template =
         "image/jp2")
     );
 
-static void gst_jasper_enc_base_init (gpointer g_class);
-static void gst_jasper_enc_class_init (GstJasperEncClass * klass);
-static void gst_jasper_enc_init (GstJasperEnc * filter,
-    GstJasperEncClass * klass);
-
 static void gst_jasper_enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_jasper_enc_get_property (GObject * object, guint prop_id,
diff --git a/ext/kate/gstkatetag.c b/ext/kate/gstkatetag.c
index 897d1a571..e1c1c3cf4 100644
--- a/ext/kate/gstkatetag.c
+++ b/ext/kate/gstkatetag.c
@@ -89,9 +89,6 @@ enum
   ARG_ORIGINAL_CANVAS_HEIGHT,
 };
 
-static void gst_kate_tag_base_init (gpointer g_class);
-static void gst_kate_tag_class_init (GstKateTagClass * klass);
-static void gst_kate_tag_init (GstKateTag * kt, GstKateTagClass * g_class);
 static GstFlowReturn gst_kate_tag_parse_packet (GstKateParse * parse,
     GstBuffer * buffer);
 static void gst_kate_tag_set_property (GObject * object, guint prop_id,
diff --git a/ext/metadata/gstmetadatademux.c b/ext/metadata/gstmetadatademux.c
index 337c61ba1..a4d485e9c 100644
--- a/ext/metadata/gstmetadatademux.c
+++ b/ext/metadata/gstmetadatademux.c
@@ -166,14 +166,6 @@ gst_metadata_demux_configure_srccaps (GstMetadataDemux * filter);
  * GObject callback functions declaration
  */
 
-static void gst_metadata_demux_base_init (gpointer gclass);
-
-static void gst_metadata_demux_class_init (GstMetadataDemuxClass * klass);
-
-static void
-gst_metadata_demux_init (GstMetadataDemux * filter,
-    GstMetadataDemuxClass * gclass);
-
 static void gst_metadata_demux_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 
diff --git a/ext/metadata/gstmetadatamux.c b/ext/metadata/gstmetadatamux.c
index 2caaf74ad..61d2b4f9d 100644
--- a/ext/metadata/gstmetadatamux.c
+++ b/ext/metadata/gstmetadatamux.c
@@ -147,13 +147,6 @@ static gboolean gst_metadata_mux_configure_srccaps (GstMetadataMux * filter);
  * GObject callback functions declaration
  */
 
-static void gst_metadata_mux_base_init (gpointer gclass);
-
-static void gst_metadata_mux_class_init (GstMetadataMuxClass * klass);
-
-static void
-gst_metadata_mux_init (GstMetadataMux * filter, GstMetadataMuxClass * gclass);
-
 static void gst_metadata_mux_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 
diff --git a/ext/metadata/metadataparseutil.h b/ext/metadata/metadataparseutil.h
index 8535644d9..e24341bdc 100644
--- a/ext/metadata/metadataparseutil.h
+++ b/ext/metadata/metadataparseutil.h
@@ -72,14 +72,5 @@ extern MetadataParsingReturn
 metadataparse_util_jump_chunk (guint32 * read, guint8 ** buf,
     guint32 * bufsize, guint8 ** next_start, guint32 * next_size);
 
-extern MetadataParsingReturn
-metadataparse_util_hold_chunk (guint32 * read, guint8 ** buf,
-    guint32 * bufsize, guint8 ** next_start,
-    guint32 * next_size, GstAdapter ** adapter);
-
-extern MetadataParsingReturn
-metadataparse_util_jump_chunk (guint32 * read, guint8 ** buf,
-    guint32 * bufsize, guint8 ** next_start, guint32 * next_size);
-
 G_END_DECLS
 #endif /* __GST_METADATAPARSE_UTIL_H__ */
diff --git a/ext/timidity/gsttimidity.c b/ext/timidity/gsttimidity.c
index eda20ca75..d6a0ccc4a 100644
--- a/ext/timidity/gsttimidity.c
+++ b/ext/timidity/gsttimidity.c
@@ -63,9 +63,6 @@ enum
   /* FILL ME */
 };
 
-static void gst_timidity_base_init (gpointer g_class);
-static void gst_timidity_class_init (GstTimidityClass * klass);
-
 static gboolean gst_timidity_src_event (GstPad * pad, GstEvent * event);
 static GstStateChangeReturn gst_timidity_change_state (GstElement * element,
     GstStateChange transition);
diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c
index a5e6e2a51..deb7ee4f7 100644
--- a/ext/timidity/gstwildmidi.c
+++ b/ext/timidity/gstwildmidi.c
@@ -75,8 +75,6 @@ enum
   /* FILL ME */
 };
 
-static void gst_wildmidi_base_init (gpointer g_class);
-static void gst_wildmidi_class_init (GstWildmidiClass * klass);
 static void gst_wildmidi_finalize (GObject * object);
 
 static gboolean gst_wildmidi_sink_event (GstPad * pad, GstEvent * event);
diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c
index 1b1929d81..61ac7f882 100644
--- a/gst/camerabin/gstcamerabin.c
+++ b/gst/camerabin/gstcamerabin.c
@@ -303,13 +303,6 @@ static void gst_camerabin_adapt_image_capture (GstCameraBin * camera,
  * GObject callback functions declaration
  */
 
-static void gst_camerabin_base_init (gpointer gclass);
-
-static void gst_camerabin_class_init (GstCameraBinClass * klass);
-
-static void
-gst_camerabin_init (GstCameraBin * camera, GstCameraBinClass * gclass);
-
 static void gst_camerabin_dispose (GObject * object);
 
 static void gst_camerabin_finalize (GObject * object);
@@ -2264,8 +2257,7 @@ static void
 gst_camerabin_adapt_image_capture (GstCameraBin * camera, GstCaps * in_caps)
 {
   GstStructure *in_st, *new_st, *req_st;
-  gint i, in_width = 0, in_height = 0, req_width = 0, req_height =
-      0, crop = 0;
+  gint i, in_width = 0, in_height = 0, req_width = 0, req_height = 0, crop = 0;
   const gchar *field_name;
   gdouble ratio_w, ratio_h;
   GstCaps *filter_caps = NULL;
diff --git a/gst/cdxaparse/gstcdxaparse.c b/gst/cdxaparse/gstcdxaparse.c
index dda0d4ff1..d19f647d8 100644
--- a/gst/cdxaparse/gstcdxaparse.c
+++ b/gst/cdxaparse/gstcdxaparse.c
@@ -39,7 +39,6 @@ static gboolean gst_cdxa_parse_sink_activate (GstPad * sinkpad);
 static void gst_cdxa_parse_loop (GstPad * sinkpad);
 static gboolean gst_cdxa_parse_sink_activate_pull (GstPad * sinkpad,
     gboolean active);
-static gboolean gst_cdxa_parse_sink_activate (GstPad * sinkpad);
 static GstStateChangeReturn gst_cdxa_parse_change_state (GstElement * element,
     GstStateChange transition);
 static gboolean gst_cdxa_parse_src_event (GstPad * srcpad, GstEvent * event);
diff --git a/gst/dtmf/gstrtpdtmfsrc.c b/gst/dtmf/gstrtpdtmfsrc.c
index 0018cb2b9..30a9f5c56 100644
--- a/gst/dtmf/gstrtpdtmfsrc.c
+++ b/gst/dtmf/gstrtpdtmfsrc.c
@@ -185,12 +185,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
 GST_BOILERPLATE (GstRTPDTMFSrc, gst_rtp_dtmf_src, GstBaseSrc,
     GST_TYPE_BASE_SRC);
 
-
-static void gst_rtp_dtmf_src_base_init (gpointer g_class);
-static void gst_rtp_dtmf_src_class_init (GstRTPDTMFSrcClass * klass);
 static void gst_rtp_dtmf_src_finalize (GObject * object);
 
-
 static void gst_rtp_dtmf_src_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_rtp_dtmf_src_get_property (GObject * object, guint prop_id,
diff --git a/gst/freeze/gstfreeze.c b/gst/freeze/gstfreeze.c
index a721eab2b..513dfc1d5 100644
--- a/gst/freeze/gstfreeze.c
+++ b/gst/freeze/gstfreeze.c
@@ -58,7 +58,6 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS_ANY);
 
-static void gst_freeze_class_init (GstFreezeClass * klass);
 static void gst_freeze_dispose (GObject * object);
 static void gst_freeze_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
diff --git a/gst/jpegformat/gstjifmux.c b/gst/jpegformat/gstjifmux.c
index 63fdc972c..17c1df78a 100644
--- a/gst/jpegformat/gstjifmux.c
+++ b/gst/jpegformat/gstjifmux.c
@@ -95,8 +95,6 @@ struct _GstJifMuxPrivate
   const guint8 *scan_data;
 };
 
-static void gst_jif_mux_base_init (gpointer g_class);
-static void gst_jif_mux_class_init (GstJifMuxClass * klass);
 static void gst_jif_mux_finalize (GObject * object);
 
 static void gst_jif_mux_reset (GstJifMux * self);
diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c
index bcd1cb0c0..c2d123373 100644
--- a/gst/jpegformat/gstjpegparse.c
+++ b/gst/jpegformat/gstjpegparse.c
@@ -109,8 +109,6 @@ struct _GstJpegParsePrivate
   gint framerate_denominator;
 };
 
-static void gst_jpeg_parse_base_init (gpointer g_class);
-static void gst_jpeg_parse_class_init (GstJpegParseClass * klass);
 static void gst_jpeg_parse_dispose (GObject * object);
 
 static GstFlowReturn gst_jpeg_parse_chain (GstPad * pad, GstBuffer * buffer);
diff --git a/gst/librfb/gstrfbsrc.c b/gst/librfb/gstrfbsrc.c
index 151aaa495..021fa35ae 100644
--- a/gst/librfb/gstrfbsrc.c
+++ b/gst/librfb/gstrfbsrc.c
@@ -70,8 +70,6 @@ GST_STATIC_PAD_TEMPLATE ("src",
         "height = (int) [ 16, 4096 ], " "framerate = (fraction) 0/1")
     );
 
-static void gst_rfb_src_base_init (gpointer g_class);
-static void gst_rfb_src_class_init (GstRfbSrcClass * klass);
 static void gst_rfb_src_dispose (GObject * object);
 static void gst_rfb_src_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c
index 642e130f3..ccc3262d7 100644
--- a/gst/mpegdemux/mpegtspacketizer.c
+++ b/gst/mpegdemux/mpegtspacketizer.c
@@ -48,7 +48,6 @@ static GQuark QUARK_NETWORK_ID;
 static GQuark QUARK_CURRENT_NEXT_INDICATOR;
 static GQuark QUARK_ACTUAL_NETWORK;
 static GQuark QUARK_NETWORK_NAME;
-static GQuark QUARK_TRANSPORT_STREAM_ID;
 static GQuark QUARK_ORIGINAL_NETWORK_ID;
 static GQuark QUARK_TRANSPORTS;
 
@@ -2227,7 +2226,6 @@ _init_local ()
   QUARK_CURRENT_NEXT_INDICATOR = g_quark_from_string ("current-next-indicator");
   QUARK_ACTUAL_NETWORK = g_quark_from_string ("actual-network");
   QUARK_NETWORK_NAME = g_quark_from_string ("network-name");
-  QUARK_TRANSPORT_STREAM_ID = g_quark_from_string ("transport-stream-id");
   QUARK_ORIGINAL_NETWORK_ID = g_quark_from_string ("original-network-id");
   QUARK_TRANSPORTS = g_quark_from_string ("transports");
 
diff --git a/gst/pnm/gstpnmdec.c b/gst/pnm/gstpnmdec.c
index 063d499e8..41fd9e715 100644
--- a/gst/pnm/gstpnmdec.c
+++ b/gst/pnm/gstpnmdec.c
@@ -55,6 +55,8 @@ static GstStaticPadTemplate gst_pnmdec_sink_pad_template =
 GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
     GST_STATIC_CAPS (MIME_ALL));
 
+GST_BOILERPLATE (GstPnmdec, gst_pnmdec, GstElement, GST_TYPE_ELEMENT);
+
 static GstFlowReturn
 gst_pnmdec_push (GstPnmdec * s, GstPad * src, GstBuffer * buf)
 {
@@ -330,5 +332,3 @@ gst_pnmdec_class_init (GstPnmdecClass * klass)
 
   gobject_class->finalize = gst_pnmdec_finalize;
 }
-
-GST_BOILERPLATE (GstPnmdec, gst_pnmdec, GstElement, GST_TYPE_ELEMENT)
diff --git a/gst/pnm/gstpnmenc.c b/gst/pnm/gstpnmenc.c
index aa341b7e2..6fac3b08e 100644
--- a/gst/pnm/gstpnmenc.c
+++ b/gst/pnm/gstpnmenc.c
@@ -62,6 +62,8 @@ static GstStaticPadTemplate src_pad_template =
 GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
     GST_STATIC_CAPS (MIME_ALL));
 
+GST_BOILERPLATE (GstPnmenc, gst_pnmenc, GstElement, GST_TYPE_ELEMENT);
+
 static void
 gst_pnmenc_set_property (GObject * object, guint prop_id, const GValue * value,
     GParamSpec * pspec)
@@ -255,5 +257,3 @@ gst_pnmenc_class_init (GstPnmencClass * klass)
       g_param_spec_boolean ("ascii", "ASCII Encoding", "The output will be "
           "ASCII encoded", FALSE, G_PARAM_READWRITE));
 }
-
-GST_BOILERPLATE (GstPnmenc, gst_pnmenc, GstElement, GST_TYPE_ELEMENT)
diff --git a/gst/sdp/gstsdpdemux.c b/gst/sdp/gstsdpdemux.c
index f7b48585f..3f9306e27 100644
--- a/gst/sdp/gstsdpdemux.c
+++ b/gst/sdp/gstsdpdemux.c
@@ -112,7 +112,6 @@ enum
   PROP_LATENCY
 };
 
-static void gst_sdp_demux_base_init (gpointer g_class);
 static void gst_sdp_demux_finalize (GObject * object);
 
 static void gst_sdp_demux_set_property (GObject * object, guint prop_id,
diff --git a/gst/subenc/gstsrtenc.c b/gst/subenc/gstsrtenc.c
index 4077f7655..beeede50f 100644
--- a/gst/subenc/gstsrtenc.c
+++ b/gst/subenc/gstsrtenc.c
@@ -49,11 +49,8 @@ static GstFlowReturn gst_srt_enc_chain (GstPad * pad, GstBuffer * buf);
 static gboolean plugin_init (GstPlugin * plugin);
 static gchar *gst_srt_enc_timeconvertion (GstSrtEnc * srtenc, GstBuffer * buf);
 static gchar *gst_srt_enc_timestamp_to_string (GstClockTime timestamp);
-static void gst_srt_enc_base_init (gpointer klass);
-static void gst_srt_enc_class_init (GstSrtEncClass * klass);
 static void gst_srt_enc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static void gst_srt_enc_init (GstSrtEnc * src, GstSrtEncClass * klass);
 static void gst_srt_enc_reset (GstSrtEnc * srtenc);
 static void gst_srt_enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
-- 
cgit v1.2.3