From 73cc44a5e858d15ccff2893f042b9bebd7c05bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 29 Dec 2007 17:31:49 +0000 Subject: Fix 'xyz may be used uninitialized' compiler warnings caused by broken g_assert_not_reached() macro in GLib-2.15.x an... Original commit message from CVS: * ext/ladspa/gstladspa.c: (gst_ladspa_get_property): * ext/sdl/sdlvideosink.c: (gst_sdlvideosink_show_frame): * gst/mve/gstmvemux.c: (gst_mve_mux_request_new_pad): * sys/dvb/dvbbasebin.c: (dvb_base_bin_class_init): Fix 'xyz may be used uninitialized' compiler warnings caused by broken g_assert_not_reached() macro in GLib-2.15.x and don't abort() in any case but properly report the error. --- ChangeLog | 10 ++++++++++ ext/ladspa/gstladspa.c | 4 ++-- ext/sdl/sdlvideosink.c | 4 +++- gst/mve/gstmvemux.c | 2 +- sys/dvb/dvbbasebin.c | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 528cd112..86bdd639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-12-29 Sebastian Dröge + + * ext/ladspa/gstladspa.c: (gst_ladspa_get_property): + * ext/sdl/sdlvideosink.c: (gst_sdlvideosink_show_frame): + * gst/mve/gstmvemux.c: (gst_mve_mux_request_new_pad): + * sys/dvb/dvbbasebin.c: (dvb_base_bin_class_init): + Fix 'xyz may be used uninitialized' compiler warnings caused + by broken g_assert_not_reached() macro in GLib-2.15.x and don't + abort() in any case but properly report the error. + 2007-12-29 Sebastian Dröge * configure.ac: diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index d8525d82..1fd42c9f 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -424,7 +424,7 @@ gst_ladspa_get_property (GObject * object, guint prop_id, GValue * value, controls = gsp->control_out; prop_id -= gsp_class->num_control_in; } else { - g_assert_not_reached (); + g_return_if_reached (); } /* now see what type it is */ @@ -439,7 +439,7 @@ gst_ladspa_get_property (GObject * object, guint prop_id, GValue * value, g_value_set_float (value, controls[prop_id]); break; default: - g_assert_not_reached (); + g_return_if_reached (); } } diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index 4664c219..321b7e89 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -778,7 +778,9 @@ gst_sdlvideosink_show_frame (GstBaseSink * bsink, GstBuffer * buf) v = y + I420_V_OFFSET (sdlvideosink->width, sdlvideosink->height); break; default: - g_assert_not_reached (); + gst_sdlvideosink_unlock (sdlvideosink); + g_mutex_unlock (sdlvideosink->lock); + g_return_val_if_reached (GST_FLOW_ERROR); } /* Y Plane */ diff --git a/gst/mve/gstmvemux.c b/gst/mve/gstmvemux.c index ce87006f..5282f810 100644 --- a/gst/mve/gstmvemux.c +++ b/gst/mve/gstmvemux.c @@ -1320,7 +1320,7 @@ gst_mve_mux_request_new_pad (GstElement * element, mvemux->video_pad_eos = FALSE; pad = mvemux->videosink; } else { - g_assert_not_reached (); + g_return_val_if_reached (NULL); } gst_pad_set_chain_function (pad, GST_DEBUG_FUNCPTR (gst_mve_mux_chain)); diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c index 2e007666..8f633e66 100644 --- a/sys/dvb/dvbbasebin.c +++ b/sys/dvb/dvbbasebin.c @@ -276,7 +276,10 @@ dvb_base_bin_class_init (DvbBaseBinClass * klass) g_param_spec_get_nick (pspec), g_param_spec_get_blurb (pspec), pspec->value_type, src_pspec->default_value, pspec->flags); } else { - g_assert_not_reached (); + GST_ERROR ("Unsupported property type %d for property %s", + param_type, g_param_spec_get_name (pspec)); + ++walk; + continue; } g_object_class_install_property (gobject_class, walk->prop_id, our_pspec); -- cgit v1.2.1