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

all: use nm_g_variant_new_au() helper

Browse source
This commit is contained in:
Thomas Haller 2021-04-15 09:43:42 +02:00
parent f34841e196
commit 80e30f4562
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
7 changed files with 23 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/NetworkManagerUtils.c
View file

@ -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)",

10
src/core/nm-dispatcher.c
View file

@ -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);

16
src/core/nm-ip4-config.c
View file

@ -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);

6
src/core/nm-manager.c
View file

@ -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);

18
src/core/ppp/nm-pppd-plugin.c
View file

@ -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...");

2
src/libnm-core-impl/nm-setting-dcb.c
View file

@ -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

10
src/libnm-core-impl/nm-utils.c
View file

@ -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));
}
}