Merge branch 'hotfix/explicit-cast-warnings'

RidgeRun · Aug 11, 2020 · c5371c8 · c5371c8
2 parents 7d1c3d4 + 7c7b2c8
commit c5371c8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -6,7 +6,7 @@ dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, git and prerelease does Werror too
 dnl
 AC_INIT([GstShark],
-        [0.7.0.1],
+        [0.7.1.1],
 	[https://github.com/RidgeRun/gst-shark],
 	[gst-shark],
 	[https://github.com/RidgeRun/gst-shark])

diff --git a/m4/gst-shark.m4 b/m4/gst-shark.m4
@@ -10,8 +10,8 @@ AC_DEFUN([AG_GST_SHARK_INIT],
   m4_pattern_forbid(^_?AG_GST_SHARK_)
 
   dnl FIXME: find a better way to do this
-  GST_SHARK_README_LONG=`sed -rn '/^## Description/,/^#/{ /^## Description/{n;n;}; /^#/q; p;}' README | tr '\n' ' '`
-  GST_SHARK_README_SHORT=`sed -rn 's/^> (.*)$/\1/p' README | tr '\n' ' '`
+  GST_SHARK_README_LONG=`sed -En '/^## Description/,/^#/{ /^## Description/{n;n;}; /^#/q; p;}' README | tr '\n' ' '`
+  GST_SHARK_README_SHORT=`sed -En 's/^> (.*)$/\1/p' README | tr '\n' ' '`
 
   GST_SHARK_PACKAGE_CREATED=2016-01-29
   GST_SHARK_PACKAGE_MAILINGLIST=

diff --git a/plugins/tracers/gstperiodictracer.c b/plugins/tracers/gstperiodictracer.c
@@ -227,15 +227,13 @@ callback_internal (gpointer * data)
 static gint
 set_period (GstPeriodicTracer * self)
 {
-  GstPeriodicTracerPrivate *priv = NULL;
   GList *list = NULL;
   GstSharkTracer *tracer = NULL;
   static const gchar *name = "period";
   gint period = -1;
 
   g_return_val_if_fail (self, DEFAULT_TIMEOUT_INTERVAL);
 
-  priv = GST_PERIODIC_TRACER_PRIVATE (self);
   tracer = GST_SHARK_TRACER (self);
 
   list = gst_shark_tracer_get_param (tracer, name);
@@ -246,7 +244,7 @@ set_period (GstPeriodicTracer * self)
     period = DEFAULT_TIMEOUT_INTERVAL;
   } else {
     GST_INFO_OBJECT (self, "Attempting to parse provided period \"%s\"",
-        list->data);
+        (gchar *) list->data);
     period = g_ascii_strtoull (list->data, NULL, 0);
     /* On error, 0 is set */
     if (0 == period) {