From cc2cc037178a89f4266303fb91152f1e4e54ff53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 9 Jul 2022 17:02:26 +0300 Subject: [PATCH] registry: Remove dead code Initialization/updating of the registry can't possible fail and all code paths always returned TRUE. Part-of: --- subprojects/gstreamer/gst/gstregistry.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/subprojects/gstreamer/gst/gstregistry.c b/subprojects/gstreamer/gst/gstregistry.c index 3c43ceb..daa5e72 100644 --- a/subprojects/gstreamer/gst/gstregistry.c +++ b/subprojects/gstreamer/gst/gstregistry.c @@ -1809,12 +1809,11 @@ scan_and_update_registry (GstRegistry * default_registry, return REGISTRY_SCAN_AND_UPDATE_SUCCESS_UPDATED; } -static gboolean +static void ensure_current_registry (GError ** error) { gchar *registry_file; GstRegistry *default_registry; - gboolean ret = TRUE; gboolean do_update = TRUE; gboolean have_cache = TRUE; @@ -1864,9 +1863,7 @@ ensure_current_registry (GError ** error) } g_free (registry_file); - GST_INFO ("registry reading and updating done, result = %d", ret); - - return ret; + GST_INFO ("registry reading and updating done"); } #endif /* GST_DISABLE_REGISTRY */ @@ -1929,13 +1926,11 @@ gst_registry_fork_set_enabled (gboolean enabled) gboolean gst_update_registry (void) { - gboolean res; - #ifndef GST_DISABLE_REGISTRY if (!_priv_gst_disable_registry) { GError *err = NULL; - res = ensure_current_registry (&err); + ensure_current_registry (&err); if (err) { GST_WARNING ("registry update failed: %s", err->message); g_error_free (err); @@ -1944,12 +1939,10 @@ gst_update_registry (void) } } else { GST_INFO ("registry update disabled by environment"); - res = TRUE; } #else GST_WARNING ("registry update failed: %s", "registry disabled"); - res = TRUE; #endif /* GST_DISABLE_REGISTRY */ #ifndef GST_DISABLE_OPTION_PARSING @@ -1959,7 +1952,7 @@ gst_update_registry (void) } #endif - return res; + return TRUE; } /** -- 2.7.4