fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 16:00:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

glib-aux: add nm_g_variant_singleton_a*() helpers

Browse source
This commit is contained in:
Thomas Haller 2021-04-14 21:11:42 +02:00
parent ce9211500e
commit b01cbff087
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/libnm-glib-aux/nm-shared-utils.c
View file

@ -556,6 +556,54 @@ nm_g_variant_singleton_u_0(void)
return _variant_singleton_get(g_variant_new_uint32(0));
}
static GVariant *
_variant_singleton_get_array_init(GVariant **p_singleton, const char *variant_type)
{
GVariant *v;
v = g_variant_new_array(G_VARIANT_TYPE(variant_type), NULL, 0);
g_variant_ref_sink(v);
if (G_LIKELY(g_atomic_pointer_compare_and_exchange(p_singleton, NULL, v)))
return v;
g_variant_unref(v);
return g_atomic_pointer_get(p_singleton);
}
#define _variant_singleton_get_array(variant_type) \
({ \
static GVariant *_singleton = NULL; \
GVariant * _v; \
\
_v = g_atomic_pointer_get(&_singleton); \
if (G_UNLIKELY(!_v)) { \
_v = _variant_singleton_get_array_init(&_singleton, "" variant_type ""); \
nm_assert(_v); \
} \
nm_assert(g_variant_is_of_type(_v, G_VARIANT_TYPE("a" variant_type ""))); \
_v; \
})
GVariant *
nm_g_variant_singleton_aLsvI(void)
{
return _variant_singleton_get_array("{sv}");
}
GVariant *
nm_g_variant_singleton_aLsaLsvII(void)
{
return _variant_singleton_get_array("{sa{sv}}");
}
GVariant *
nm_g_variant_singleton_aaLsvI(void)
{
return _variant_singleton_get_array("a{sv}");
}
/*****************************************************************************/
GHashTable *

3
src/libnm-glib-aux/nm-shared-utils.h
View file

@ -1442,6 +1442,9 @@ char *nm_utils_str_utf8safe_unescape_cp(const char *str, NMUtilsStrUtf8SafeFlags
char *nm_utils_str_utf8safe_escape_take(char *str, NMUtilsStrUtf8SafeFlags flags);
GVariant *nm_g_variant_singleton_u_0(void);
GVariant *nm_g_variant_singleton_aLsvI(void);
GVariant *nm_g_variant_singleton_aLsaLsvII(void);
GVariant *nm_g_variant_singleton_aaLsvI(void);
static inline void
nm_g_variant_unref_floating(GVariant *var)