From 18acdeeba5ab7a6679ac1b95c227e133fc608eec Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 20 May 2019 15:28:35 +0200 Subject: [PATCH] settings: don't remember path of setting plugin It was only kept to compare whether we loaded the same plugin multiple times. Note that load_plugins() already checks for duplicate plugin names, so it actually could not happen that we tried to load the same file more than once. --- src/settings/nm-settings.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 723732df1e..ab7b7b1aef 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -86,7 +86,6 @@ EXPORT(nm_settings_connection_update) /*****************************************************************************/ -static NM_CACHED_QUARK_FCN ("plugin-module-path", plugin_module_path_quark) static NM_CACHED_QUARK_FCN ("default-wired-connection", _default_wired_connection_quark) static NM_CACHED_QUARK_FCN ("default-wired-device", _default_wired_device_quark) @@ -620,26 +619,17 @@ add_plugin (NMSettings *self, NMSettingsPlugin *plugin, const char *path) static gboolean add_plugin_load_file (NMSettings *self, const char *pname, GError **error) { - NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self); gs_free char *full_name = NULL; gs_free char *path = NULL; gs_unref_object NMSettingsPlugin *plugin = NULL; GModule *module; NMSettingsPluginFactoryFunc factory_func; - GSList *iter; struct stat st; int errsv; full_name = g_strdup_printf ("nm-settings-plugin-%s", pname); path = g_module_build_path (NMPLUGINDIR, full_name); - for (iter = priv->plugins; iter; iter = iter->next) { - if (nm_streq0 (path, - g_object_get_qdata (iter->data, - plugin_module_path_quark ()))) - return TRUE; - } - if (stat (path, &st) != 0) { errsv = errno; _LOGW ("could not load plugin '%s' from file '%s': %s", pname, path, nm_strerror_native (errsv)); @@ -688,10 +678,6 @@ add_plugin_load_file (NMSettings *self, const char *pname, GError **error) } add_plugin (self, NM_SETTINGS_PLUGIN (plugin), path); - g_object_set_qdata_full (G_OBJECT (plugin), - plugin_module_path_quark (), - g_steal_pointer (&path), - g_free); return TRUE; }