proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-14 17:28:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Move assigning a GError for future code

Browse Source
This commit is contained in:
Richard Hughes 2017-11-21 21:38:37 +00:00
parent e89ab5976f
commit 175635b916
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fu-engine.c
View File

@ -245,13 +245,17 @@ fu_engine_get_item_by_guid (FuEngine *self, const gchar *guid)
} }
static FuPlugin * static FuPlugin *
fu_engine_get_plugin_by_name (FuEngine *self, const gchar *name) fu_engine_get_plugin_by_name (FuEngine *self, const gchar *name, GError **error)
{ {
for (guint i = 0; i < self->plugins->len; i++) { for (guint i = 0; i < self->plugins->len; i++) {
FuPlugin *plugin = g_ptr_array_index (self->plugins, i); FuPlugin *plugin = g_ptr_array_index (self->plugins, i);
if (g_strcmp0 (fu_plugin_get_name (plugin), name) == 0) if (g_strcmp0 (fu_plugin_get_name (plugin), name) == 0)
return plugin; return plugin;
} }
g_set_error (error,
FWUPD_ERROR,
FWUPD_ERROR_NOT_FOUND,
"no plugin %s found", name);
return NULL; return NULL;
} }
@ -1371,14 +1375,9 @@ fu_engine_get_item_by_id_fallback_pending (FuEngine *self, const gchar *id, GErr
item = fu_engine_get_item_by_id (self, fu_device_get_id (dev), NULL); item = fu_engine_get_item_by_id (self, fu_device_get_id (dev), NULL);
if (item == NULL) { if (item == NULL) {
tmp = fu_device_get_plugin (dev); tmp = fu_device_get_plugin (dev);
plugin = fu_engine_get_plugin_by_name (self, tmp); plugin = fu_engine_get_plugin_by_name (self, tmp, error);
if (plugin == NULL) { if (plugin == NULL)
g_set_error (error,
FWUPD_ERROR,
FWUPD_ERROR_NOT_FOUND,
"no plugin %s found", tmp);
return NULL; return NULL;
}
item = fu_engine_add_item (self, dev, plugin); item = fu_engine_add_item (self, dev, plugin);
/* FIXME: just a boolean on FuDeviceItem? */ /* FIXME: just a boolean on FuDeviceItem? */
@ -2826,7 +2825,7 @@ fu_engine_load_plugins (FuEngine *self, GError **error)
deps = fu_plugin_get_rules (plugin, FU_PLUGIN_RULE_RUN_AFTER); deps = fu_plugin_get_rules (plugin, FU_PLUGIN_RULE_RUN_AFTER);
for (guint j = 0; j < deps->len && !changes; j++) { for (guint j = 0; j < deps->len && !changes; j++) {
const gchar *plugin_name = g_ptr_array_index (deps, j); const gchar *plugin_name = g_ptr_array_index (deps, j);
dep = fu_engine_get_plugin_by_name (self, plugin_name); dep = fu_engine_get_plugin_by_name (self, plugin_name, NULL);
if (dep == NULL) { if (dep == NULL) {
g_debug ("cannot find plugin '%s' " g_debug ("cannot find plugin '%s' "
"requested by '%s'", "requested by '%s'",
@ -2854,7 +2853,7 @@ fu_engine_load_plugins (FuEngine *self, GError **error)
deps = fu_plugin_get_rules (plugin, FU_PLUGIN_RULE_RUN_BEFORE); deps = fu_plugin_get_rules (plugin, FU_PLUGIN_RULE_RUN_BEFORE);
for (guint j = 0; j < deps->len && !changes; j++) { for (guint j = 0; j < deps->len && !changes; j++) {
const gchar *plugin_name = g_ptr_array_index (deps, j); const gchar *plugin_name = g_ptr_array_index (deps, j);
dep = fu_engine_get_plugin_by_name (self, plugin_name); dep = fu_engine_get_plugin_by_name (self, plugin_name, NULL);
if (dep == NULL) { if (dep == NULL) {
g_debug ("cannot find plugin '%s' " g_debug ("cannot find plugin '%s' "
"requested by '%s'", "requested by '%s'",
@ -2896,7 +2895,7 @@ fu_engine_load_plugins (FuEngine *self, GError **error)
deps = fu_plugin_get_rules (plugin, FU_PLUGIN_RULE_CONFLICTS); deps = fu_plugin_get_rules (plugin, FU_PLUGIN_RULE_CONFLICTS);
for (guint j = 0; j < deps->len && !changes; j++) { for (guint j = 0; j < deps->len && !changes; j++) {
const gchar *plugin_name = g_ptr_array_index (deps, j); const gchar *plugin_name = g_ptr_array_index (deps, j);
dep = fu_engine_get_plugin_by_name (self, plugin_name); dep = fu_engine_get_plugin_by_name (self, plugin_name, NULL);
if (dep == NULL) if (dep == NULL)
continue; continue;
if (!fu_plugin_get_enabled (dep)) if (!fu_plugin_get_enabled (dep))