all: use nm_g_variant_new_au() helperth/gvariant-helpers

7 files changed, 23 insertions, 53 deletions

diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c
index 59a65b0699..481672968b 100644
--- a/src/core/NetworkManagerUtils.c
+++ b/src/core/NetworkManagerUtils.c
@@ -1496,12 +1496,7 @@ nm_utils_ip_addresses_to_dbus(int                          addr_family,
                         : (guint32) 0,
                 };
 
-                g_variant_builder_add(&builder_legacy,
-                                      "@au",
-                                      g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                                                dbus_addr,
-                                                                3,
-                                                                sizeof(guint32)));
+                g_variant_builder_add(&builder_legacy, "@au", nm_g_variant_new_au(dbus_addr, 3));
             } else {
                 g_variant_builder_add(
                     &builder_legacy,
@@ -1623,12 +1618,7 @@ nm_utils_ip_routes_to_dbus(int                          addr_family,
                     r->r4.metric,
                 };
 
-                g_variant_builder_add(&builder_legacy,
-                                      "@au",
-                                      g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                                                dbus_route,
-                                                                4,
-                                                                sizeof(guint32)));
+                g_variant_builder_add(&builder_legacy, "@au", nm_g_variant_new_au(dbus_route, 4));
             } else {
                 g_variant_builder_add(&builder_legacy,
                                       "(@ayu@ayu)",
diff --git a/src/core/nm-dispatcher.c b/src/core/nm-dispatcher.c
index 81076810e4..32c9db627c 100644
--- a/src/core/nm-dispatcher.c
+++ b/src/core/nm-dispatcher.c
@@ -206,10 +206,7 @@ dump_ip_to_props(NMIPConfig *ip, GVariantBuilder *builder)
             array[0] = addr->a4.address;
             array[1] = addr->a4.plen;
             array[2] = gw;
-            g_variant_builder_add(
-                &int_builder,
-                "@au",
-                g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, array, 3, sizeof(guint32)));
+            g_variant_builder_add(&int_builder, "@au", nm_g_variant_new_au(array, 3));
         } else {
             const struct in6_addr *gw = &in6addr_any;
 
@@ -278,10 +275,7 @@ dump_ip_to_props(NMIPConfig *ip, GVariantBuilder *builder)
             array[1] = route->r4.plen;
             array[2] = route->r4.gateway;
             array[3] = route->r4.metric;
-            g_variant_builder_add(
-                &int_builder,
-                "@au",
-                g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, array, 4, sizeof(guint32)));
+            g_variant_builder_add(&int_builder, "@au", nm_g_variant_new_au(array, 4));
         } else {
             var1 = nm_g_variant_new_ay_in6addr(&route->r6.network);
             var2 = nm_g_variant_new_ay_in6addr(&route->r6.gateway);
diff --git a/src/core/nm-ip4-config.c b/src/core/nm-ip4-config.c
index 9f8238841f..a6072ccb44 100644
--- a/src/core/nm-ip4-config.c
+++ b/src/core/nm-ip4-config.c
@@ -3016,11 +3016,9 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
         g_value_take_variant(value, g_variant_builder_end(&builder_data));
         break;
     case PROP_NAMESERVERS:
-        g_value_take_variant(value,
-                             g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                                       priv->nameservers->data,
-                                                       priv->nameservers->len,
-                                                       sizeof(guint32)));
+        g_value_take_variant(
+            value,
+            nm_g_variant_new_au((const guint32 *) priv->nameservers->data, priv->nameservers->len));
         break;
     case PROP_DOMAINS:
         nm_utils_g_value_set_strv(value, priv->domains);
@@ -3045,11 +3043,9 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
         g_value_take_variant(value, g_variant_builder_end(&builder_data));
         break;
     case PROP_WINS_SERVERS:
-        g_value_take_variant(value,
-                             g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                                       priv->wins->data,
-                                                       priv->wins->len,
-                                                       sizeof(guint32)));
+        g_value_take_variant(
+            value,
+            nm_g_variant_new_au((const guint32 *) priv->wins->data, priv->wins->len));
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index 50d2e3225a..f5a696f1fa 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -7940,10 +7940,8 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
         break;
     case PROP_CAPABILITIES:
         g_value_set_variant(value,
-                            g_variant_new_fixed_array(G_VARIANT_TYPE("u"),
-                                                      priv->capabilities->data,
-                                                      priv->capabilities->len,
-                                                      sizeof(guint32)));
+                            nm_g_variant_new_au((const guint32 *) priv->capabilities->data,
+                                                priv->capabilities->len));
         break;
     case PROP_STATE:
         g_value_set_uint(value, priv->state);
diff --git a/src/core/ppp/nm-pppd-plugin.c b/src/core/ppp/nm-pppd-plugin.c
index 13c4e512df..5ffa7d17cc 100644
--- a/src/core/ppp/nm-pppd-plugin.c
+++ b/src/core/ppp/nm-pppd-plugin.c
@@ -226,11 +226,10 @@ nm_ip_up(void *data, int arg)
         if (opts.dnsaddr[1])
             dns[len++] = opts.dnsaddr[1];
 
-        g_variant_builder_add(
-            &builder,
-            "{sv}",
-            NM_PPP_IP4_CONFIG_DNS,
-            g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, dns, len, sizeof(guint32)));
+        g_variant_builder_add(&builder,
+                              "{sv}",
+                              NM_PPP_IP4_CONFIG_DNS,
+                              nm_g_variant_new_au(dns, len));
     }
 
     if (opts.winsaddr[0] || opts.winsaddr[1]) {
@@ -242,11 +241,10 @@ nm_ip_up(void *data, int arg)
         if (opts.winsaddr[1])
             wins[len++] = opts.winsaddr[1];
 
-        g_variant_builder_add(
-            &builder,
-            "{sv}",
-            NM_PPP_IP4_CONFIG_WINS,
-            g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, wins, len, sizeof(guint32)));
+        g_variant_builder_add(&builder,
+                              "{sv}",
+                              NM_PPP_IP4_CONFIG_WINS,
+                              nm_g_variant_new_au(wins, len));
     }
 
     g_message("nm-ppp-plugin: sending IPv4 config to NetworkManager...");
diff --git a/src/libnm-core-impl/nm-setting-dcb.c b/src/libnm-core-impl/nm-setting-dcb.c
index 695953d14e..b7f0808769 100644
--- a/src/libnm-core-impl/nm-setting-dcb.c
+++ b/src/libnm-core-impl/nm-setting-dcb.c
@@ -733,7 +733,7 @@ _nm_setting_dcb_uint_array_to_dbus(const GValue *prop_value)
 {
     GArray *src = g_value_get_boxed(prop_value);
 
-    return g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, src->data, src->len, sizeof(guint32));
+    return nm_g_variant_new_au((const guint32 *) src->data, src->len);
 }
 
 static void
diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c
index b4762fab74..07302cb117 100644
--- a/src/libnm-core-impl/nm-utils.c
+++ b/src/libnm-core-impl/nm-utils.c
@@ -1377,10 +1377,7 @@ nm_utils_ip4_addresses_to_variant(GPtrArray *addresses, const char *gateway)
             array[1] = nm_ip_address_get_prefix(addr);
             array[2] = gw;
 
-            g_variant_builder_add(
-                &builder,
-                "@au",
-                g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, array, 3, sizeof(guint32)));
+            g_variant_builder_add(&builder, "@au", nm_g_variant_new_au(array, 3));
         }
     }
 
@@ -1479,10 +1476,7 @@ nm_utils_ip4_routes_to_variant(GPtrArray *routes)
             /* The old routes format uses "0" for default, not "-1" */
             array[3] = MAX(0, nm_ip_route_get_metric(route));
 
-            g_variant_builder_add(
-                &builder,
-                "@au",
-                g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, array, 4, sizeof(guint32)));
+            g_variant_builder_add(&builder, "@au", nm_g_variant_new_au(array, 4));
         }
     }