gplugin/gplugin

removed gotos

2021-08-19, ivanhoe
d028ac082bea
Parents a53b048e32ae
Children 71f0a1891d24
removed gotos
--- a/gplugin/gplugin-manager.c Thu Aug 19 16:27:00 2021 -0500
+++ b/gplugin/gplugin-manager.c Thu Aug 19 16:27:01 2021 -0500
@@ -1628,9 +1628,9 @@
g_free(filename);
gplugin_plugin_set_state(plugin, GPLUGIN_PLUGIN_STATE_LOAD_FAILED);
+ g_object_unref(G_OBJECT(loader));
- ret = FALSE;
- goto cleanup;
+ return FALSE;
}
g_signal_emit(manager, signals[SIG_LOADING], 0, plugin, &real_error, &ret);
@@ -1641,8 +1641,9 @@
g_propagate_error(error, real_error);
gplugin_plugin_set_state(plugin, GPLUGIN_PLUGIN_STATE_LOAD_FAILED);
+ g_object_unref(G_OBJECT(loader));
- goto cleanup;
+ return ret;
}
ret = gplugin_loader_load_plugin(loader, plugin, &real_error);
@@ -1655,7 +1656,6 @@
g_propagate_error(error, real_error);
}
- cleanup:
g_object_unref(G_OBJECT(loader));
return ret;
@@ -1696,9 +1696,9 @@
GPLUGIN_DOMAIN,
0,
_("Plugin loader is not a loader"));
+ g_object_unref(G_OBJECT(loader));
- ret = FALSE;
- goto cleanup;
+ return FALSE;
}
g_signal_emit(
@@ -1715,8 +1715,9 @@
g_propagate_error(error, real_error);
gplugin_plugin_set_state(plugin, GPLUGIN_PLUGIN_STATE_LOAD_FAILED);
+ g_object_unref(G_OBJECT(loader));
- goto cleanup;
+ return ret;
}
ret = gplugin_loader_unload_plugin(loader, plugin, &real_error);
@@ -1729,7 +1730,6 @@
g_propagate_error(error, real_error);
}
- cleanup:
g_object_unref(G_OBJECT(loader));
return ret;