diff --git a/libfwupd/fwupd-common-private.h b/libfwupd/fwupd-common-private.h index 1414377ac..c58d79b0d 100644 --- a/libfwupd/fwupd-common-private.h +++ b/libfwupd/fwupd-common-private.h @@ -51,4 +51,11 @@ GUnixInputStream * fwupd_unix_input_stream_from_fn(const gchar *fn, GError **error) G_GNUC_WARN_UNUSED_RESULT; #endif +void +fwupd_pad_kv_unx(GString *str, const gchar *key, guint64 value); +void +fwupd_pad_kv_str(GString *str, const gchar *key, const gchar *value); +void +fwupd_pad_kv_int(GString *str, const gchar *key, guint32 value); + G_END_DECLS diff --git a/libfwupd/fwupd-common.c b/libfwupd/fwupd-common.c index 94e91ad7f..62906e946 100644 --- a/libfwupd/fwupd-common.c +++ b/libfwupd/fwupd-common.c @@ -1220,3 +1220,51 @@ fwupd_common_json_add_stringv(JsonBuilder *builder, const gchar *key, gchar **va json_builder_add_string_value(builder, value[i]); json_builder_end_array(builder); } + +/** + * fwupd_pad_kv_str: (skip): + **/ +void +fwupd_pad_kv_str(GString *str, const gchar *key, const gchar *value) +{ + /* ignore */ + if (key == NULL || value == NULL) + return; + g_string_append_printf(str, " %s: ", key); + for (gsize i = strlen(key); i < 20; i++) + g_string_append(str, " "); + g_string_append_printf(str, "%s\n", value); +} + +/** + * fwupd_pad_kv_unx: (skip): + **/ +void +fwupd_pad_kv_unx(GString *str, const gchar *key, guint64 value) +{ + g_autoptr(GDateTime) date = NULL; + g_autofree gchar *tmp = NULL; + + /* ignore */ + if (value == 0) + return; + + date = g_date_time_new_from_unix_utc((gint64)value); + tmp = g_date_time_format(date, "%F"); + fwupd_pad_kv_str(str, key, tmp); +} + +/** + * fwupd_pad_kv_int: (skip): + **/ +void +fwupd_pad_kv_int(GString *str, const gchar *key, guint32 value) +{ + g_autofree gchar *tmp = NULL; + + /* ignore */ + if (value == 0) + return; + tmp = g_strdup_printf("%" G_GUINT32_FORMAT, value); + fwupd_pad_kv_str(str, key, tmp); +} diff --git a/libfwupd/fwupd-device.c b/libfwupd/fwupd-device.c index 73feb3b19..735a34927 100644 --- a/libfwupd/fwupd-device.c +++ b/libfwupd/fwupd-device.c @@ -2446,33 +2446,6 @@ fwupd_device_from_key_value(FwupdDevice *self, const gchar *key, GVariant *value } } -static void -fwupd_pad_kv_str(GString *str, const gchar *key, const gchar *value) -{ - /* ignore */ - if (key == NULL || value == NULL) - return; - g_string_append_printf(str, " %s: ", key); - for (gsize i = strlen(key); i < 20; i++) - g_string_append(str, " "); - g_string_append_printf(str, "%s\n", value); -} - -static void -fwupd_pad_kv_unx(GString *str, const gchar *key, guint64 value) -{ - g_autoptr(GDateTime) date = NULL; - g_autofree gchar *tmp = NULL; - - /* ignore */ - if (value == 0) - return; - - date = g_date_time_new_from_unix_utc((gint64)value); - tmp = g_date_time_format(date, "%F"); - fwupd_pad_kv_str(str, key, tmp); -} - static void fwupd_pad_kv_dfl(GString *str, const gchar *key, guint64 device_flags) { @@ -2507,18 +2480,6 @@ fwupd_device_pad_kv_problems(GString *str, const gchar *key, guint64 device_prob fwupd_pad_kv_str(str, key, tmp->str); } -static void -fwupd_pad_kv_int(GString *str, const gchar *key, guint32 value) -{ - g_autofree gchar *tmp = NULL; - - /* ignore */ - if (value == 0) - return; - tmp = g_strdup_printf("%" G_GUINT32_FORMAT, value); - fwupd_pad_kv_str(str, key, tmp); -} - /** * fwupd_device_get_update_state: * @self: a #FwupdDevice diff --git a/libfwupd/fwupd-plugin.c b/libfwupd/fwupd-plugin.c index 17bb56c0f..4c045df67 100644 --- a/libfwupd/fwupd-plugin.c +++ b/libfwupd/fwupd-plugin.c @@ -225,18 +225,6 @@ fwupd_plugin_from_key_value(FwupdPlugin *self, const gchar *key, GVariant *value } } -static void -fwupd_pad_kv_str(GString *str, const gchar *key, const gchar *value) -{ - /* ignore */ - if (key == NULL || value == NULL) - return; - g_string_append_printf(str, " %s: ", key); - for (gsize i = strlen(key); i < 20; i++) - g_string_append(str, " "); - g_string_append_printf(str, "%s\n", value); -} - static void fwupd_pad_kv_dfl(GString *str, const gchar *key, guint64 plugin_flags) { diff --git a/libfwupd/fwupd-release.c b/libfwupd/fwupd-release.c index 5b812e6a5..838d15377 100644 --- a/libfwupd/fwupd-release.c +++ b/libfwupd/fwupd-release.c @@ -1942,33 +1942,6 @@ fwupd_release_from_key_value(FwupdRelease *self, const gchar *key, GVariant *val } } -static void -fwupd_pad_kv_str(GString *str, const gchar *key, const gchar *value) -{ - /* ignore */ - if (key == NULL || value == NULL) - return; - g_string_append_printf(str, " %s: ", key); - for (gsize i = strlen(key); i < 20; i++) - g_string_append(str, " "); - g_string_append_printf(str, "%s\n", value); -} - -static void -fwupd_pad_kv_unx(GString *str, const gchar *key, guint64 value) -{ - g_autoptr(GDateTime) date = NULL; - g_autofree gchar *tmp = NULL; - - /* ignore */ - if (value == 0) - return; - - date = g_date_time_new_from_unix_utc((gint64)value); - tmp = g_date_time_format(date, "%F"); - fwupd_pad_kv_str(str, key, tmp); -} - static void fwupd_pad_kv_siz(GString *str, const gchar *key, guint64 value) { @@ -1998,18 +1971,6 @@ fwupd_pad_kv_tfl(GString *str, const gchar *key, FwupdReleaseFlags release_flags fwupd_pad_kv_str(str, key, tmp->str); } -static void -fwupd_pad_kv_int(GString *str, const gchar *key, guint32 value) -{ - g_autofree gchar *tmp = NULL; - - /* ignore */ - if (value == 0) - return; - tmp = g_strdup_printf("%" G_GUINT32_FORMAT, value); - fwupd_pad_kv_str(str, key, tmp); -} - /** * fwupd_release_to_json: * @self: a #FwupdRelease diff --git a/libfwupd/fwupd-request.c b/libfwupd/fwupd-request.c index cde4c55e4..a3ed9e8bc 100644 --- a/libfwupd/fwupd-request.c +++ b/libfwupd/fwupd-request.c @@ -6,6 +6,7 @@ #include "config.h" +#include "fwupd-common-private.h" #include "fwupd-enums-private.h" #include "fwupd-request-private.h" @@ -280,33 +281,6 @@ fwupd_request_from_key_value(FwupdRequest *self, const gchar *key, GVariant *val } } -static void -fwupd_pad_kv_str(GString *str, const gchar *key, const gchar *value) -{ - /* ignore */ - if (key == NULL || value == NULL) - return; - g_string_append_printf(str, " %s: ", key); - for (gsize i = strlen(key); i < 20; i++) - g_string_append(str, " "); - g_string_append_printf(str, "%s\n", value); -} - -static void -fwupd_pad_kv_unx(GString *str, const gchar *key, guint64 value) -{ - g_autoptr(GDateTime) date = NULL; - g_autofree gchar *tmp = NULL; - - /* ignore */ - if (value == 0) - return; - - date = g_date_time_new_from_unix_utc((gint64)value); - tmp = g_date_time_format(date, "%F"); - fwupd_pad_kv_str(str, key, tmp); -} - /** * fwupd_request_get_message: * @self: a #FwupdRequest diff --git a/libfwupd/fwupd-security-attr.c b/libfwupd/fwupd-security-attr.c index 01553b2f4..1e6469517 100644 --- a/libfwupd/fwupd-security-attr.c +++ b/libfwupd/fwupd-security-attr.c @@ -1086,18 +1086,6 @@ fwupd_security_attr_from_key_value(FwupdSecurityAttr *self, const gchar *key, GV } } -static void -fwupd_pad_kv_str(GString *str, const gchar *key, const gchar *value) -{ - /* ignore */ - if (key == NULL || value == NULL) - return; - g_string_append_printf(str, " %s: ", key); - for (gsize i = strlen(key); i < 20; i++) - g_string_append(str, " "); - g_string_append_printf(str, "%s\n", value); -} - static void fwupd_pad_kv_tfl(GString *str, const gchar *key, FwupdSecurityAttrFlags security_attr_flags) { @@ -1117,18 +1105,6 @@ fwupd_pad_kv_tfl(GString *str, const gchar *key, FwupdSecurityAttrFlags security fwupd_pad_kv_str(str, key, tmp->str); } -static void -fwupd_pad_kv_int(GString *str, const gchar *key, guint32 value) -{ - g_autofree gchar *tmp = NULL; - - /* ignore */ - if (value == 0) - return; - tmp = g_strdup_printf("%" G_GUINT32_FORMAT, value); - fwupd_pad_kv_str(str, key, tmp); -} - /** * fwupd_security_attr_from_json: * @self: a #FwupdSecurityAttr @@ -1298,21 +1274,6 @@ fwupd_security_attr_to_json(FwupdSecurityAttr *self, JsonBuilder *builder) } } -static void -fwupd_pad_kv_unx(GString *str, const gchar *key, guint64 value) -{ - g_autoptr(GDateTime) date = NULL; - g_autofree gchar *tmp = NULL; - - /* ignore */ - if (value == 0) - return; - - date = g_date_time_new_from_unix_utc((gint64)value); - tmp = g_date_time_format(date, "%F"); - fwupd_pad_kv_str(str, key, tmp); -} - /** * fwupd_security_attr_to_string: * @self: a #FwupdSecurityAttr