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: Remove dead code

Browse source 
Initialization/updating of the registry can't possible fail and all code
paths always returned TRUE.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2858>
This commit is contained in:
Sebastian Dröge 2022-07-09 17:02:26 +03:00 committed by Tim-Philipp Müller
parent e192116c37
commit d80589592d
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
subprojects/gstreamer/gst/gstregistry.c
View file

@ -1804,12 +1804,11 @@ scan_and_update_registry (GstRegistry * default_registry,
return REGISTRY_SCAN_AND_UPDATE_SUCCESS_UPDATED; return REGISTRY_SCAN_AND_UPDATE_SUCCESS_UPDATED;
} }
static gboolean static void
ensure_current_registry (GError ** error) ensure_current_registry (GError ** error)
{ {
gchar *registry_file; gchar *registry_file;
GstRegistry *default_registry; GstRegistry *default_registry;
gboolean ret = TRUE;
gboolean do_update = TRUE; gboolean do_update = TRUE;
gboolean have_cache = TRUE; gboolean have_cache = TRUE;
@ -1859,9 +1858,7 @@ ensure_current_registry (GError ** error)
} }
g_free (registry_file); g_free (registry_file);
GST_INFO ("registry reading and updating done, result = %d", ret); GST_INFO ("registry reading and updating done");
return ret;
} }
#endif /* GST_DISABLE_REGISTRY */ #endif /* GST_DISABLE_REGISTRY */
@ -1924,13 +1921,11 @@ gst_registry_fork_set_enabled (gboolean enabled)
gboolean gboolean
gst_update_registry (void) gst_update_registry (void)
{ {
gboolean res;
#ifndef GST_DISABLE_REGISTRY #ifndef GST_DISABLE_REGISTRY
if (!_priv_gst_disable_registry) { if (!_priv_gst_disable_registry) {
GError *err = NULL; GError *err = NULL;
res = ensure_current_registry (&err); ensure_current_registry (&err);
if (err) { if (err) {
GST_WARNING ("registry update failed: %s", err->message); GST_WARNING ("registry update failed: %s", err->message);
g_error_free (err); g_error_free (err);
@ -1939,12 +1934,10 @@ gst_update_registry (void)
} }
} else { } else {
GST_INFO ("registry update disabled by environment"); GST_INFO ("registry update disabled by environment");
res = TRUE;
} }
#else #else
GST_WARNING ("registry update failed: %s", "registry disabled"); GST_WARNING ("registry update failed: %s", "registry disabled");
res = TRUE;
#endif /* GST_DISABLE_REGISTRY */ #endif /* GST_DISABLE_REGISTRY */
#ifndef GST_DISABLE_OPTION_PARSING #ifndef GST_DISABLE_OPTION_PARSING
@ -1954,7 +1947,7 @@ gst_update_registry (void)
} }
#endif #endif
return res; return TRUE;
} }
/** /**