diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2007-12-26 16:03:57 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-12-26 16:03:57 +0000 |
| commit | bcdeaa639b88bafd2d260ec262a2a38a19dfbeb6 (patch) | |
| tree | 1515afc26b24b1905db793abeec85992beb1cccf | |
| parent | 427ab08ae2095effe48bfd25b7a411222487dd7b (diff) | |
Fix 'xyz may be used uninitialized' compiler warnings caused by broken g_assert_not_reached() macro in GLib-2.15.x (i...
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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gst/avi/gstavidemux.c | 4 | ||||
| -rw-r--r-- | gst/wavparse/gstwavparse.c | 2 | ||||
| -rw-r--r-- | sys/ximage/gstximagesrc.c | 2 |
4 files changed, 14 insertions, 3 deletions
@@ -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 e6eb49ee..628e21da 100644 --- 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 40ad3219..c9e3a52a 100644 --- 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 115d271b..c5ed9c26 100644 --- 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: |