mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:28:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

Makefile.am portability fix better error handling, this solves the g_error_free assert error some people had

Browse source 
Original commit message from CVS:
Makefile.am portability fix
better error handling, this solves the g_error_free assert error some people
had
This commit is contained in:
Thomas Vander Stichele 2002-07-12 14:14:30 +00:00
parent b3d5bbd72c
commit 45d414338b
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/gstplugin.c
View file

@ -191,6 +191,15 @@ gst_plugin_load_plugin (GstPlugin *plugin, GError **error)
plugin->module = module; plugin->module = module;
return TRUE; return TRUE;
} }
else {
/* plugin == NULL */
g_set_error (error,
GST_PLUGIN_ERROR,
GST_PLUGIN_ERROR_MODULE,
"gst_plugin_register_func failed for plugin \"%s\"",
filename);
return FALSE;
}
} }
else { else {
g_set_error (error, g_set_error (error,
@ -207,8 +216,16 @@ gst_plugin_load_plugin (GstPlugin *plugin, GError **error)
GST_PLUGIN_ERROR_MODULE, GST_PLUGIN_ERROR_MODULE,
"Error loading plugin %s, reason: %s\n", "Error loading plugin %s, reason: %s\n",
filename, g_module_error()); filename, g_module_error());
return FALSE;
} }
/* FIXME: this should not happen */
g_set_error (error,
GST_PLUGIN_ERROR,
GST_PLUGIN_ERROR_MODULE,
"Error loading plugin %s, reason: %s\n",
filename,
"fell of the end of the gst_plugin_load_plugin function");
return FALSE; return FALSE;
} }

2
gst/schedulers/Makefile.am
View file

@ -25,6 +25,6 @@ libgstfaststandardscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
## this is a REALLY evil hack ## this is a REALLY evil hack
## but we need to keep it as long as we have libs/gst and libs/ext ## but we need to keep it as long as we have libs/gst and libs/ext
$(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la: $(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la:
cd $(top_builddir)/libs/ext/cothreads/cothreads && make cd $(top_builddir)/libs/ext/cothreads/cothreads && ${MAKE}
noinst_HEADERS = cothreads_compat.h noinst_HEADERS = cothreads_compat.h