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

registry: avoid some more unnecessary malloc/frees

Browse source
This commit is contained in:
Tim-Philipp Müller 2010-01-12 21:34:03 +00:00
parent 5e47d24e1b
commit 4da2c6b380
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/gstregistrychunks.c
View file

@ -504,14 +504,13 @@ gst_registry_chunks_load_feature (GstRegistry * registry, gchar ** in,
{ {
GstRegistryChunkPluginFeature *pf = NULL; GstRegistryChunkPluginFeature *pf = NULL;
GstPluginFeature *feature = NULL; GstPluginFeature *feature = NULL;
const gchar *const_str; const gchar *const_str, *type_name;
gchar *type_name = NULL, *str; gchar *str, *feature_name;
gchar *feature_name;
GType type; GType type;
guint i; guint i;
/* unpack plugin feature strings */ /* unpack plugin feature strings */
unpack_string (*in, type_name, end, fail); unpack_string_nocopy (*in, type_name, end, fail);
if (G_UNLIKELY (!type_name)) { if (G_UNLIKELY (!type_name)) {
GST_ERROR ("No feature type name"); GST_ERROR ("No feature type name");
@ -527,13 +526,11 @@ gst_registry_chunks_load_feature (GstRegistry * registry, gchar ** in,
if (G_UNLIKELY (!(type = g_type_from_name (type_name)))) { if (G_UNLIKELY (!(type = g_type_from_name (type_name)))) {
GST_ERROR ("Unknown type from typename '%s' for plugin '%s'", type_name, GST_ERROR ("Unknown type from typename '%s' for plugin '%s'", type_name,
plugin_name); plugin_name);
g_free (type_name);
g_free (feature_name); g_free (feature_name);
return FALSE; return FALSE;
} }
if (G_UNLIKELY ((feature = g_object_newv (type, 0, NULL)) == NULL)) { if (G_UNLIKELY ((feature = g_object_newv (type, 0, NULL)) == NULL)) {
GST_ERROR ("Can't create feature from type"); GST_ERROR ("Can't create feature from type");
g_free (type_name);
g_free (feature_name); g_free (feature_name);
return FALSE; return FALSE;
} }
@ -648,13 +645,11 @@ gst_registry_chunks_load_feature (GstRegistry * registry, gchar ** in,
gst_registry_add_feature (registry, feature); gst_registry_add_feature (registry, feature);
GST_DEBUG ("Added feature %s", feature->name); GST_DEBUG ("Added feature %s", feature->name);
g_free (type_name);
return TRUE; return TRUE;
/* Errors */ /* Errors */
fail: fail:
GST_INFO ("Reading plugin feature failed"); GST_INFO ("Reading plugin feature failed");
g_free (type_name);
if (feature) { if (feature) {
if (GST_IS_OBJECT (feature)) if (GST_IS_OBJECT (feature))
gst_object_unref (feature); gst_object_unref (feature);