ogg: element_init returns void

no need to return boolean as it will be always TRUE. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1029>
sailfishos-mirror · Mar 16, 2021 · d8e00a4 · d8e00a4
1 parent a06be2e
commit d8e00a4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 29 deletions.
diff --git a/ext/ogg/gstoggaviparse.c b/ext/ogg/gstoggaviparse.c
@@ -76,41 +76,41 @@ struct _GstOggAviParseClass
 static GstElementClass *parent_class = NULL;
 
 G_DEFINE_TYPE (GstOggAviParse, gst_ogg_avi_parse, GST_TYPE_ELEMENT);
-
-#define _do_init \
-    GST_DEBUG_CATEGORY_INIT (gst_ogg_avi_parse_debug, "oggaviparse", 0, "ogg avi parser");
 GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (oggaviparse, "oggaviparse",
-    GST_RANK_PRIMARY, GST_TYPE_OGG_AVI_PARSE, _do_init)
+    GST_RANK_PRIMARY, GST_TYPE_OGG_AVI_PARSE,
+    GST_DEBUG_CATEGORY_INIT (gst_ogg_avi_parse_debug, "oggaviparse", 0,
+        "ogg avi parser"));
 
-     enum
-     {
-       PROP_0
-     };
+enum
+{
+  PROP_0
+};
 
-     static GstStaticPadTemplate ogg_avi_parse_src_template_factory =
-         GST_STATIC_PAD_TEMPLATE ("src",
+static GstStaticPadTemplate ogg_avi_parse_src_template_factory =
+GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-vorbis")
     );
 
-     static GstStaticPadTemplate ogg_avi_parse_sink_template_factory =
-         GST_STATIC_PAD_TEMPLATE ("sink",
+static GstStaticPadTemplate ogg_avi_parse_sink_template_factory =
+GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("application/x-ogg-avi")
     );
 
-     static void gst_ogg_avi_parse_finalize (GObject * object);
-     static GstStateChangeReturn gst_ogg_avi_parse_change_state (GstElement *
+static void gst_ogg_avi_parse_finalize (GObject * object);
+static GstStateChangeReturn gst_ogg_avi_parse_change_state (GstElement *
     element, GstStateChange transition);
-     static gboolean gst_ogg_avi_parse_event (GstPad * pad, GstObject * parent,
+static gboolean gst_ogg_avi_parse_event (GstPad * pad, GstObject * parent,
     GstEvent * event);
-     static GstFlowReturn gst_ogg_avi_parse_chain (GstPad * pad,
+static GstFlowReturn gst_ogg_avi_parse_chain (GstPad * pad,
     GstObject * parent, GstBuffer * buffer);
-     static gboolean gst_ogg_avi_parse_setcaps (GstPad * pad, GstCaps * caps);
+static gboolean gst_ogg_avi_parse_setcaps (GstPad * pad, GstCaps * caps);
 
-     static void gst_ogg_avi_parse_class_init (GstOggAviParseClass * klass)
+static void
+gst_ogg_avi_parse_class_init (GstOggAviParseClass * klass)
 {
   GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);

diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
@@ -140,11 +140,9 @@ static GstStateChangeReturn gst_ogg_mux_change_state (GstElement * element,
 #define gst_ogg_mux_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstOggMux, gst_ogg_mux, GST_TYPE_ELEMENT,
     G_IMPLEMENT_INTERFACE (GST_TYPE_PRESET, NULL));
-
-#define _do_init \
-    GST_DEBUG_CATEGORY_INIT (gst_ogg_mux_debug, "oggmux", 0, "ogg muxer");
 GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (oggmux, "oggmux", GST_RANK_PRIMARY,
-    GST_TYPE_OGG_MUX, _do_init);
+    GST_TYPE_OGG_MUX, GST_DEBUG_CATEGORY_INIT (gst_ogg_mux_debug, "oggmux", 0,
+        "ogg muxer"));
 
 static void
 gst_ogg_mux_class_init (GstOggMuxClass * klass)

diff --git a/ext/ogg/gstoggparse.c b/ext/ogg/gstoggparse.c
@@ -84,11 +84,9 @@ struct _GstOggParseClass
 
 static GstElementClass *parent_class = NULL;
 G_DEFINE_TYPE (GstOggParse, gst_ogg_parse, GST_TYPE_ELEMENT);
-
-#define _do_init \
-    GST_DEBUG_CATEGORY_INIT (gst_ogg_parse_debug, "oggparse", 0, "ogg parser");
 GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (oggparse, "oggparse", GST_RANK_NONE,
-    GST_TYPE_OGG_PARSE, _do_init);
+    GST_TYPE_OGG_PARSE, GST_DEBUG_CATEGORY_INIT (gst_ogg_parse_debug,
+        "oggparse", 0, "ogg parser"));
 
 static void
 free_stream (GstOggStream * stream)

diff --git a/ext/ogg/gstogmparse.c b/ext/ogg/gstogmparse.c
@@ -150,7 +150,7 @@ static void gst_ogm_parse_init (GstOgmParse * ogm);
 static void gst_ogm_video_parse_init (GstOgmParse * ogm);
 static void gst_ogm_audio_parse_init (GstOgmParse * ogm);
 static void gst_ogm_text_parse_init (GstOgmParse * ogm);
-static gboolean gst_ogm_parse_element_init (GstPlugin * plugin);
+static void gst_ogm_parse_element_init (GstPlugin * plugin);
 
 static gboolean gst_ogm_parse_sink_event (GstPad * pad, GstObject * parent,
     GstEvent * event);
@@ -966,7 +966,7 @@ gst_ogm_parse_change_state (GstElement * element, GstStateChange transition)
   return ret;
 }
 
-static gboolean
+static void
 gst_ogm_parse_element_init (GstPlugin * plugin)
 {
   static gsize res = FALSE;
@@ -975,5 +975,4 @@ gst_ogm_parse_element_init (GstPlugin * plugin)
     GST_DEBUG_CATEGORY_INIT (gst_ogm_parse_debug, "ogmparse", 0, "ogm parser");
     g_once_init_leave (&res, TRUE);
   }
-  return res;
 }