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

trivial: Convert FwupdPlugin to use @self

Browse Source
This commit is contained in:
Richard Hughes 2021-05-10 11:59:38 +01:00
parent 8246e43174
commit 3f0340c3a7
3 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfwupd/fwupd-plugin-private.h
View File

@ -12,8 +12,8 @@
G_BEGIN_DECLS G_BEGIN_DECLS
GVariant *fwupd_plugin_to_variant (FwupdPlugin *plugin); GVariant *fwupd_plugin_to_variant (FwupdPlugin *self);
void fwupd_plugin_to_json (FwupdPlugin *plugin, void fwupd_plugin_to_json (FwupdPlugin *self,
JsonBuilder *builder); JsonBuilder *builder);
G_END_DECLS G_END_DECLS

130
libfwupd/fwupd-plugin.c
View File

@ -39,7 +39,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (FwupdPlugin, fwupd_plugin, G_TYPE_OBJECT)
/** /**
* fwupd_plugin_get_name: * fwupd_plugin_get_name:
* @plugin: a #FwupdPlugin * @self: a #FwupdPlugin
* *
* Gets the plugin name. * Gets the plugin name.
* *
@ -48,16 +48,16 @@ G_DEFINE_TYPE_WITH_PRIVATE (FwupdPlugin, fwupd_plugin, G_TYPE_OBJECT)
* Since: 1.5.0 * Since: 1.5.0
**/ **/
const gchar * const gchar *
fwupd_plugin_get_name (FwupdPlugin *plugin) fwupd_plugin_get_name (FwupdPlugin *self)
{ {
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
g_return_val_if_fail (FWUPD_IS_PLUGIN (plugin), NULL); g_return_val_if_fail (FWUPD_IS_PLUGIN (self), NULL);
return priv->name; return priv->name;
} }
/** /**
* fwupd_plugin_set_name: * fwupd_plugin_set_name:
* @plugin: a #FwupdPlugin * @self: a #FwupdPlugin
* @name: the plugin name, e.g. `bios` * @name: the plugin name, e.g. `bios`
* *
* Sets the plugin name. * Sets the plugin name.
@ -65,10 +65,10 @@ fwupd_plugin_get_name (FwupdPlugin *plugin)
* Since: 1.5.0 * Since: 1.5.0
**/ **/
void void
fwupd_plugin_set_name (FwupdPlugin *plugin, const gchar *name) fwupd_plugin_set_name (FwupdPlugin *self, const gchar *name)
{ {
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
g_return_if_fail (FWUPD_IS_PLUGIN (plugin)); g_return_if_fail (FWUPD_IS_PLUGIN (self));
g_return_if_fail (name != NULL); g_return_if_fail (name != NULL);
/* not changed */ /* not changed */
@ -77,12 +77,12 @@ fwupd_plugin_set_name (FwupdPlugin *plugin, const gchar *name)
g_free (priv->name); g_free (priv->name);
priv->name = g_strdup (name); priv->name = g_strdup (name);
g_object_notify (G_OBJECT (plugin), "name"); g_object_notify (G_OBJECT (self), "name");
} }
/** /**
* fwupd_plugin_get_flags: * fwupd_plugin_get_flags:
* @plugin: a #FwupdPlugin * @self: a #FwupdPlugin
* *
* Gets the plugin flags. * Gets the plugin flags.
* *
@ -91,16 +91,16 @@ fwupd_plugin_set_name (FwupdPlugin *plugin, const gchar *name)
* Since: 1.5.0 * Since: 1.5.0
**/ **/
guint64 guint64
fwupd_plugin_get_flags (FwupdPlugin *plugin) fwupd_plugin_get_flags (FwupdPlugin *self)
{ {
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
g_return_val_if_fail (FWUPD_IS_PLUGIN (plugin), 0); g_return_val_if_fail (FWUPD_IS_PLUGIN (self), 0);
return priv->flags; return priv->flags;
} }
/** /**
* fwupd_plugin_set_flags: * fwupd_plugin_set_flags:
* @plugin: a #FwupdPlugin * @self: a #FwupdPlugin
* @flags: plugin flags, e.g. %FWUPD_PLUGIN_FLAG_CAPSULES_UNSUPPORTED * @flags: plugin flags, e.g. %FWUPD_PLUGIN_FLAG_CAPSULES_UNSUPPORTED
* *
* Sets the plugin flags. * Sets the plugin flags.
@ -108,19 +108,19 @@ fwupd_plugin_get_flags (FwupdPlugin *plugin)
* Since: 1.5.0 * Since: 1.5.0
**/ **/
void void
fwupd_plugin_set_flags (FwupdPlugin *plugin, guint64 flags) fwupd_plugin_set_flags (FwupdPlugin *self, guint64 flags)
{ {
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
g_return_if_fail (FWUPD_IS_PLUGIN (plugin)); g_return_if_fail (FWUPD_IS_PLUGIN (self));
if (priv->flags == flags) if (priv->flags == flags)
return; return;
priv->flags = flags; priv->flags = flags;
g_object_notify (G_OBJECT (plugin), "flags"); g_object_notify (G_OBJECT (self), "flags");
} }
/** /**
* fwupd_plugin_add_flag: * fwupd_plugin_add_flag:
* @plugin: a #FwupdPlugin * @self: a #FwupdPlugin
* @flag: the #FwupdPluginFlags * @flag: the #FwupdPluginFlags
* *
* Adds a specific plugin flag to the plugin. * Adds a specific plugin flag to the plugin.
@ -128,21 +128,21 @@ fwupd_plugin_set_flags (FwupdPlugin *plugin, guint64 flags)
* Since: 1.5.0 * Since: 1.5.0
**/ **/
void void
fwupd_plugin_add_flag (FwupdPlugin *plugin, FwupdPluginFlags flag) fwupd_plugin_add_flag (FwupdPlugin *self, FwupdPluginFlags flag)
{ {
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
g_return_if_fail (FWUPD_IS_PLUGIN (plugin)); g_return_if_fail (FWUPD_IS_PLUGIN (self));
if (flag == 0) if (flag == 0)
return; return;
if ((priv->flags & flag) > 0) if ((priv->flags & flag) > 0)
return; return;
priv->flags |= flag; priv->flags |= flag;
g_object_notify (G_OBJECT (plugin), "flags"); g_object_notify (G_OBJECT (self), "flags");
} }
/** /**
* fwupd_plugin_remove_flag: * fwupd_plugin_remove_flag:
* @plugin: a #FwupdPlugin * @self: a #FwupdPlugin
* @flag: a plugin flag * @flag: a plugin flag
* *
* Removes a specific plugin flag from the plugin. * Removes a specific plugin flag from the plugin.
@ -150,21 +150,21 @@ fwupd_plugin_add_flag (FwupdPlugin *plugin, FwupdPluginFlags flag)
* Since: 1.5.0 * Since: 1.5.0
**/ **/
void void
fwupd_plugin_remove_flag (FwupdPlugin *plugin, FwupdPluginFlags flag) fwupd_plugin_remove_flag (FwupdPlugin *self, FwupdPluginFlags flag)
{ {
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
g_return_if_fail (FWUPD_IS_PLUGIN (plugin)); g_return_if_fail (FWUPD_IS_PLUGIN (self));
if (flag == 0) if (flag == 0)
return; return;
if ((priv->flags & flag) == 0) if ((priv->flags & flag) == 0)
return; return;
priv->flags &= ~flag; priv->flags &= ~flag;
g_object_notify (G_OBJECT (plugin), "flags"); g_object_notify (G_OBJECT (self), "flags");
} }
/** /**
* fwupd_plugin_has_flag: * fwupd_plugin_has_flag:
* @plugin: a #FwupdPlugin * @self: a #FwupdPlugin
* @flag: a plugin flag * @flag: a plugin flag
* *
* Finds if the plugin has a specific plugin flag. * Finds if the plugin has a specific plugin flag.
@ -174,16 +174,16 @@ fwupd_plugin_remove_flag (FwupdPlugin *plugin, FwupdPluginFlags flag)
* Since: 1.5.0 * Since: 1.5.0
**/ **/
gboolean gboolean
fwupd_plugin_has_flag (FwupdPlugin *plugin, FwupdPluginFlags flag) fwupd_plugin_has_flag (FwupdPlugin *self, FwupdPluginFlags flag)
{ {
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
g_return_val_if_fail (FWUPD_IS_PLUGIN (plugin), FALSE); g_return_val_if_fail (FWUPD_IS_PLUGIN (self), FALSE);
return (priv->flags & flag) > 0; return (priv->flags & flag) > 0;
} }
/** /**
* fwupd_plugin_to_variant: * fwupd_plugin_to_variant:
* @plugin: a #FwupdPlugin * @self: a #FwupdPlugin
* *
* Serialize the plugin data omitting sensitive fields * Serialize the plugin data omitting sensitive fields
* *
@ -192,12 +192,12 @@ fwupd_plugin_has_flag (FwupdPlugin *plugin, FwupdPluginFlags flag)
* Since: 1.5.0 * Since: 1.5.0
**/ **/
GVariant * GVariant *
fwupd_plugin_to_variant (FwupdPlugin *plugin) fwupd_plugin_to_variant (FwupdPlugin *self)
{ {
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
GVariantBuilder builder; GVariantBuilder builder;
g_return_val_if_fail (FWUPD_IS_PLUGIN (plugin), NULL); g_return_val_if_fail (FWUPD_IS_PLUGIN (self), NULL);
/* create an array with all the metadata in */ /* create an array with all the metadata in */
g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT); g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
@ -215,14 +215,14 @@ fwupd_plugin_to_variant (FwupdPlugin *plugin)
} }
static void static void
fwupd_plugin_from_key_value (FwupdPlugin *plugin, const gchar *key, GVariant *value) fwupd_plugin_from_key_value (FwupdPlugin *self, const gchar *key, GVariant *value)
{ {
if (g_strcmp0 (key, FWUPD_RESULT_KEY_NAME) == 0) { if (g_strcmp0 (key, FWUPD_RESULT_KEY_NAME) == 0) {
fwupd_plugin_set_name (plugin, g_variant_get_string (value, NULL)); fwupd_plugin_set_name (self, g_variant_get_string (value, NULL));
return; return;
} }
if (g_strcmp0 (key, FWUPD_RESULT_KEY_FLAGS) == 0) { if (g_strcmp0 (key, FWUPD_RESULT_KEY_FLAGS) == 0) {
fwupd_plugin_set_flags (plugin, g_variant_get_uint64 (value)); fwupd_plugin_set_flags (self, g_variant_get_uint64 (value));
return; return;
} }
} }
@ -268,7 +268,7 @@ fwupd_plugin_json_add_string (JsonBuilder *builder, const gchar *key, const gcha
/** /**
* fwupd_plugin_to_json: * fwupd_plugin_to_json:
* @plugin: a #FwupdPlugin * @self: a #FwupdPlugin
* @builder: a JSON builder * @builder: a JSON builder
* *
* Adds a fwupd plugin to a JSON builder * Adds a fwupd plugin to a JSON builder
@ -276,11 +276,11 @@ fwupd_plugin_json_add_string (JsonBuilder *builder, const gchar *key, const gcha
* Since: 1.5.0 * Since: 1.5.0
**/ **/
void void
fwupd_plugin_to_json (FwupdPlugin *plugin, JsonBuilder *builder) fwupd_plugin_to_json (FwupdPlugin *self, JsonBuilder *builder)
{ {
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
g_return_if_fail (FWUPD_IS_PLUGIN (plugin)); g_return_if_fail (FWUPD_IS_PLUGIN (self));
g_return_if_fail (builder != NULL); g_return_if_fail (builder != NULL);
fwupd_plugin_json_add_string (builder, FWUPD_RESULT_KEY_NAME, priv->name); fwupd_plugin_json_add_string (builder, FWUPD_RESULT_KEY_NAME, priv->name);
@ -300,7 +300,7 @@ fwupd_plugin_to_json (FwupdPlugin *plugin, JsonBuilder *builder)
/** /**
* fwupd_plugin_to_string: * fwupd_plugin_to_string:
* @plugin: a #FwupdPlugin * @self: a #FwupdPlugin
* *
* Builds a text representation of the object. * Builds a text representation of the object.
* *
@ -309,12 +309,12 @@ fwupd_plugin_to_json (FwupdPlugin *plugin, JsonBuilder *builder)
* Since: 1.5.0 * Since: 1.5.0
**/ **/
gchar * gchar *
fwupd_plugin_to_string (FwupdPlugin *plugin) fwupd_plugin_to_string (FwupdPlugin *self)
{ {
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
GString *str; GString *str;
g_return_val_if_fail (FWUPD_IS_PLUGIN (plugin), NULL); g_return_val_if_fail (FWUPD_IS_PLUGIN (self), NULL);
str = g_string_new (NULL); str = g_string_new (NULL);
fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_NAME, priv->name); fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_NAME, priv->name);
@ -384,26 +384,26 @@ fwupd_plugin_class_init (FwupdPluginClass *klass)
} }
static void static void
fwupd_plugin_init (FwupdPlugin *plugin) fwupd_plugin_init (FwupdPlugin *self)
{ {
} }
static void static void
fwupd_plugin_finalize (GObject *object) fwupd_plugin_finalize (GObject *object)
{ {
FwupdPlugin *plugin = FWUPD_PLUGIN (object); FwupdPlugin *self = FWUPD_PLUGIN (object);
FwupdPluginPrivate *priv = GET_PRIVATE (plugin); FwupdPluginPrivate *priv = GET_PRIVATE (self);
g_free (priv->name); g_free (priv->name);
G_OBJECT_CLASS (fwupd_plugin_parent_class)->finalize (object); G_OBJECT_CLASS (fwupd_plugin_parent_class)->finalize (object);
} }
static void static void
fwupd_plugin_set_from_variant_iter (FwupdPlugin *plugin, GVariantIter *iter) fwupd_plugin_set_from_variant_iter (FwupdPlugin *self, GVariantIter *iter)
{ {
GVariant *value; GVariant *value;
const gchar *key; const gchar *key;
while (g_variant_iter_next (iter, "{&sv}", &key, &value)) { while (g_variant_iter_next (iter, "{&sv}", &key, &value)) {
fwupd_plugin_from_key_value (plugin, key, value); fwupd_plugin_from_key_value (self, key, value);
g_variant_unref (value); g_variant_unref (value);
} }
} }
@ -421,24 +421,24 @@ fwupd_plugin_set_from_variant_iter (FwupdPlugin *plugin, GVariantIter *iter)
FwupdPlugin * FwupdPlugin *
fwupd_plugin_from_variant (GVariant *value) fwupd_plugin_from_variant (GVariant *value)
{ {
FwupdPlugin *plugin = NULL; FwupdPlugin *self = NULL;
const gchar *type_string; const gchar *type_string;
g_autoptr(GVariantIter) iter = NULL; g_autoptr(GVariantIter) iter = NULL;
/* format from GetDetails */ /* format from GetDetails */
type_string = g_variant_get_type_string (value); type_string = g_variant_get_type_string (value);
if (g_strcmp0 (type_string, "(a{sv})") == 0) { if (g_strcmp0 (type_string, "(a{sv})") == 0) {
plugin = fwupd_plugin_new (); self = fwupd_plugin_new ();
g_variant_get (value, "(a{sv})", &iter); g_variant_get (value, "(a{sv})", &iter);
fwupd_plugin_set_from_variant_iter (plugin, iter); fwupd_plugin_set_from_variant_iter (self, iter);
} else if (g_strcmp0 (type_string, "a{sv}") == 0) { } else if (g_strcmp0 (type_string, "a{sv}") == 0) {
plugin = fwupd_plugin_new (); self = fwupd_plugin_new ();
g_variant_get (value, "a{sv}", &iter); g_variant_get (value, "a{sv}", &iter);
fwupd_plugin_set_from_variant_iter (plugin, iter); fwupd_plugin_set_from_variant_iter (self, iter);
} else { } else {
g_warning ("type %s not known", type_string); g_warning ("type %s not known", type_string);
} }
return plugin; return self;
} }
/** /**
@ -462,13 +462,13 @@ fwupd_plugin_array_from_variant (GVariant *value)
untuple = g_variant_get_child_value (value, 0); untuple = g_variant_get_child_value (value, 0);
sz = g_variant_n_children (untuple); sz = g_variant_n_children (untuple);
for (guint i = 0; i < sz; i++) { for (guint i = 0; i < sz; i++) {
FwupdPlugin *plugin; FwupdPlugin *self;
g_autoptr(GVariant) data = NULL; g_autoptr(GVariant) data = NULL;
data = g_variant_get_child_value (untuple, i); data = g_variant_get_child_value (untuple, i);
plugin = fwupd_plugin_from_variant (data); self = fwupd_plugin_from_variant (data);
if (plugin == NULL) if (self == NULL)
continue; continue;
g_ptr_array_add (array, plugin); g_ptr_array_add (array, self);
} }
return array; return array;
} }
@ -485,7 +485,7 @@ fwupd_plugin_array_from_variant (GVariant *value)
FwupdPlugin * FwupdPlugin *
fwupd_plugin_new (void) fwupd_plugin_new (void)
{ {
FwupdPlugin *plugin; FwupdPlugin *self;
plugin = g_object_new (FWUPD_TYPE_PLUGIN, NULL); self = g_object_new (FWUPD_TYPE_PLUGIN, NULL);
return FWUPD_PLUGIN (plugin); return FWUPD_PLUGIN (self);
} }

16
libfwupd/fwupd-plugin.h
View File

@ -29,19 +29,19 @@ struct _FwupdPluginClass
}; };
FwupdPlugin *fwupd_plugin_new (void); FwupdPlugin *fwupd_plugin_new (void);
gchar *fwupd_plugin_to_string (FwupdPlugin *plugin); gchar *fwupd_plugin_to_string (FwupdPlugin *self);
const gchar *fwupd_plugin_get_name (FwupdPlugin *plugin); const gchar *fwupd_plugin_get_name (FwupdPlugin *self);
void fwupd_plugin_set_name (FwupdPlugin *plugin, void fwupd_plugin_set_name (FwupdPlugin *self,
const gchar *name); const gchar *name);
guint64 fwupd_plugin_get_flags (FwupdPlugin *plugin); guint64 fwupd_plugin_get_flags (FwupdPlugin *self);
void fwupd_plugin_set_flags (FwupdPlugin *plugin, void fwupd_plugin_set_flags (FwupdPlugin *self,
guint64 flags); guint64 flags);
void fwupd_plugin_add_flag (FwupdPlugin *plugin, void fwupd_plugin_add_flag (FwupdPlugin *self,
FwupdPluginFlags flag); FwupdPluginFlags flag);
void fwupd_plugin_remove_flag (FwupdPlugin *plugin, void fwupd_plugin_remove_flag (FwupdPlugin *self,
FwupdPluginFlags flag); FwupdPluginFlags flag);
gboolean fwupd_plugin_has_flag (FwupdPlugin *plugin, gboolean fwupd_plugin_has_flag (FwupdPlugin *self,
FwupdPluginFlags flag); FwupdPluginFlags flag);
FwupdPlugin *fwupd_plugin_from_variant (GVariant *value); FwupdPlugin *fwupd_plugin_from_variant (GVariant *value);