Fix 'xyz may be used uninitialized' compiler warnings caused by broken g_assert_not_r...

Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_loop):
* gst/wavparse/gstwavparse.c: (gst_wavparse_chain):
* sys/ximage/gstximagesrc.c: (composite_pixel):
Fix 'xyz may be used uninitialized' compiler warnings caused
by broken g_assert_not_reached() macro in GLib-2.15.x (it's
not really nice to abort in any case). Fixes #505745.

diff --git a/ChangeLog b/ChangeLog
index 16d231cfad35d50ef89f1175ab543ec8e4568999..6d967b04a21c1fc77fe9352903ef2220e9a18326 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-26  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/avi/gstavidemux.c: (gst_avi_demux_loop):
+       * gst/wavparse/gstwavparse.c: (gst_wavparse_chain):
+       * sys/ximage/gstximagesrc.c: (composite_pixel):
+         Fix 'xyz may be used uninitialized' compiler warnings caused
+         by broken g_assert_not_reached() macro in GLib-2.15.x (it's
+         not really nice to abort in any case). Fixes #505745.
+
 2007-12-18  Tim-Philipp Müller  <tim at centricular dot net>
 
        * tests/check/elements/avisubtitle.c: (check_correct_buffer):

diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index e6eb49ee116bbce0cf0515dae64a351665769e2a..628e21da5e0d3bf7783add0ffe0debbbde1a7e5a 100644 (file)
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -3734,7 +3734,9 @@ gst_avi_demux_loop (GstPad * pad)
       }
       break;
     default:
-      g_assert_not_reached ();
+      GST_ERROR_OBJECT (avi, "unknown state %d", avi->state);
+      res = GST_FLOW_ERROR;
+      goto pause;
   }
 
   GST_LOG_OBJECT (avi, "state: %d res:%s", avi->state, gst_flow_get_name (res));

diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 40ad3219a7e816b757b350593b105f66632636c7..c9e3a52a02c83b493648f430d08b20605d03e7cf 100644 (file)
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -1821,7 +1821,7 @@ gst_wavparse_chain (GstPad * pad, GstBuffer * buf)
         goto done;
       break;
     default:
-      g_assert_not_reached ();
+      g_return_val_if_reached (GST_FLOW_ERROR);
   }
 done:
   return ret;

diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index 115d271b2ef9e6742c82819c4ea4a871fc359f7f..c5ed9c26a3c8e73c8c0006291f7bfd751247e7e7 100644 (file)
--- a/sys/ximage/gstximagesrc.c
+++ b/sys/ximage/gstximagesrc.c
@@ -280,7 +280,7 @@ composite_pixel (GstXContext * xcontext, guchar * dest, guchar * src)
       break;
     default:
       /* Should not reach here */
-      g_assert_not_reached ();
+      g_return_if_reached ();
   }
 
   /* possible optimisation: