From fce73b1c82179443710fb4ba8b1516f4cbc4a331 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 7 Jun 2020 16:36:28 +0200 Subject: [PATCH] shared: add nm_g_variant_builder_add_sv_*() helpers --- shared/nm-glib-aux/nm-shared-utils.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h index 7bc9e00214..2919865610 100644 --- a/shared/nm-glib-aux/nm-shared-utils.h +++ b/shared/nm-glib-aux/nm-shared-utils.h @@ -1262,6 +1262,30 @@ nm_g_variant_is_of_type (GVariant *value, && g_variant_is_of_type (value, type); } +static inline void +nm_g_variant_builder_add_sv (GVariantBuilder *builder, const char *key, GVariant *val) +{ + g_variant_builder_add (builder, "{sv}", key, val); +} + +static inline void +nm_g_variant_builder_add_sv_bytearray (GVariantBuilder *builder, const char *key, const guint8 *arr, gsize len) +{ + g_variant_builder_add (builder, "{sv}", key, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, arr, len, 1)); +} + +static inline void +nm_g_variant_builder_add_sv_uint32 (GVariantBuilder *builder, const char *key, guint32 val) +{ + nm_g_variant_builder_add_sv (builder, key, g_variant_new_uint32 (val)); +} + +static inline void +nm_g_variant_builder_add_sv_str (GVariantBuilder *builder, const char *key, const char *str) +{ + nm_g_variant_builder_add_sv (builder, key, g_variant_new_string (str)); +} + static inline void nm_g_source_destroy_and_unref (GSource *source) {