mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-22 07:08:23 +00:00
gst/gstbin.c: Don't shadow local variable.
Original commit message from CVS: * gst/gstbin.c: Don't shadow local variable. * gst/gstinfo.c: Don't shadow global function name.
This commit is contained in:
parent
f134968058
commit
65637313b0
3 changed files with 11 additions and 5 deletions
|
@ -1,3 +1,11 @@
|
|||
2007-10-13 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* gst/gstbin.c:
|
||||
Don't shadow local variable.
|
||||
|
||||
* gst/gstinfo.c:
|
||||
Don't shadow global function name.
|
||||
|
||||
2007-10-13 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* gst/gstelementfactory.c:
|
||||
|
|
|
@ -1174,8 +1174,6 @@ gst_bin_remove_func (GstBin * bin, GstElement * element)
|
|||
goto no_state_recalc;
|
||||
|
||||
if (!other_async && this_async) {
|
||||
GstStateChangeReturn ret;
|
||||
|
||||
/* all other elements were not async and we removed the async one,
|
||||
* handle the async-done case because we are not async anymore now. */
|
||||
GST_DEBUG_OBJECT (bin,
|
||||
|
|
|
@ -1216,7 +1216,7 @@ _gst_debug_nameof_funcptr (GstDebugFuncPtr ptr)
|
|||
gchar *ptrname;
|
||||
|
||||
#ifdef HAVE_DLADDR
|
||||
Dl_info dlinfo;
|
||||
Dl_info dl_info;
|
||||
#endif
|
||||
|
||||
if (G_UNLIKELY (func == NULL))
|
||||
|
@ -1234,8 +1234,8 @@ _gst_debug_nameof_funcptr (GstDebugFuncPtr ptr)
|
|||
/* we need to create an entry in the hash table for this one so we don't leak
|
||||
* the name */
|
||||
#ifdef HAVE_DLADDR
|
||||
if (dladdr ((gpointer) func, &dlinfo) && dlinfo.dli_sname) {
|
||||
gchar *name = g_strdup (dlinfo.dli_sname);
|
||||
if (dladdr ((gpointer) func, &dl_info) && dl_info.dli_sname) {
|
||||
gchar *name = g_strdup (dl_info.dli_sname);
|
||||
|
||||
_gst_debug_register_funcptr (func, name);
|
||||
return name;
|
||||
|
|
Loading…
Reference in a new issue