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

trivial: Move some code for future use

Browse Source
This commit is contained in:
Richard Hughes 2020-07-01 19:24:50 +01:00
parent 5c22406a18
commit ec2a4b586f
3 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfwupd/fwupd-common-private.h
View File

@ -13,5 +13,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
gchar *fwupd_checksum_format_for_display (const gchar *checksum); gchar *fwupd_checksum_format_for_display (const gchar *checksum);
GVariant *fwupd_hash_kv_to_variant (GHashTable *hash);
GHashTable *fwupd_variant_to_hash_kv (GVariant *dict);
G_END_DECLS G_END_DECLS

33
libfwupd/fwupd-common.c
View File

@ -894,3 +894,36 @@ fwupd_guid_hash_string (const gchar *str)
return fwupd_guid_hash_data ((const guint8 *) str, strlen (str), return fwupd_guid_hash_data ((const guint8 *) str, strlen (str),
FWUPD_GUID_FLAG_NONE); FWUPD_GUID_FLAG_NONE);
} }
/**
* fwupd_hash_kv_to_variant: (skip):
**/
GVariant *
fwupd_hash_kv_to_variant (GHashTable *hash)
{
GVariantBuilder builder;
g_autoptr(GList) keys = g_hash_table_get_keys (hash);
g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
for (GList *l = keys; l != NULL; l = l->next) {
const gchar *key = l->data;
const gchar *value = g_hash_table_lookup (hash, key);
g_variant_builder_add (&builder, "{ss}", key, value);
}
return g_variant_builder_end (&builder);
}
/**
* fwupd_variant_to_hash_kv: (skip):
**/
GHashTable *
fwupd_variant_to_hash_kv (GVariant *dict)
{
GHashTable *hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
GVariantIter iter;
const gchar *key;
const gchar *value;
g_variant_iter_init (&iter, dict);
while (g_variant_iter_loop (&iter, "{ss}", &key, &value))
g_hash_table_insert (hash, g_strdup (key), g_strdup (value));
return hash;
}

31
libfwupd/fwupd-release.c
View File

@ -1274,33 +1274,6 @@ fwupd_release_set_install_duration (FwupdRelease *release, guint32 duration)
priv->install_duration = duration; priv->install_duration = duration;
} }
static GVariant *
_hash_kv_to_variant (GHashTable *hash)
{
GVariantBuilder builder;
g_autoptr(GList) keys = g_hash_table_get_keys (hash);
g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
for (GList *l = keys; l != NULL; l = l->next) {
const gchar *key = l->data;
const gchar *value = g_hash_table_lookup (hash, key);
g_variant_builder_add (&builder, "{ss}", key, value);
}
return g_variant_builder_end (&builder);
}
static GHashTable *
_variant_to_hash_kv (GVariant *dict)
{
GHashTable *hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
GVariantIter iter;
const gchar *key;
const gchar *value;
g_variant_iter_init (&iter, dict);
while (g_variant_iter_loop (&iter, "{ss}", &key, &value))
g_hash_table_insert (hash, g_strdup (key), g_strdup (value));
return hash;
}
/** /**
* fwupd_release_to_variant: * fwupd_release_to_variant:
* @release: A #FwupdRelease * @release: A #FwupdRelease
@ -1457,7 +1430,7 @@ fwupd_release_to_variant (FwupdRelease *release)
if (g_hash_table_size (priv->metadata) > 0) { if (g_hash_table_size (priv->metadata) > 0) {
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
FWUPD_RESULT_KEY_METADATA, FWUPD_RESULT_KEY_METADATA,
_hash_kv_to_variant (priv->metadata)); fwupd_hash_kv_to_variant (priv->metadata));
} }
if (priv->install_duration > 0) { if (priv->install_duration > 0) {
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
@ -1588,7 +1561,7 @@ fwupd_release_from_key_value (FwupdRelease *release, const gchar *key, GVariant
} }
if (g_strcmp0 (key, FWUPD_RESULT_KEY_METADATA) == 0) { if (g_strcmp0 (key, FWUPD_RESULT_KEY_METADATA) == 0) {
g_hash_table_unref (priv->metadata); g_hash_table_unref (priv->metadata);
priv->metadata = _variant_to_hash_kv (value); priv->metadata = fwupd_variant_to_hash_kv (value);
return; return;
} }
} }