system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-14 20:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

gen-metadata-nm-settings-nmcli: fix some printf warnings on 32 bit platforms

Browse source 
The specifiers %ld and %lu are not correct for 64 bit integers on 32 bit
platforms, triggering a warning. Use instead the GLib constants to
correctly define them.

Fixes: 925d4df801 ('man nm-settings-nmcli: add "Valid values" field')
Fixes: 5c6ae44e00 ('man nm-settings-nmcli: add "Special values" field')

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1790
This commit is contained in:
Íñigo Huguet 2023-11-14 08:28:03 +01:00 committed by Thomas Haller
parent 451d0bf954
commit 539d6f436a
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/nmcli/gen-metadata-nm-settings-nmcli.c
View file

@ -31,7 +31,7 @@ static void G_GNUC_PRINTF(3, 4)
msg_full = g_strdup_printf("gen-metadata-nm-settings-nmcli: %s.%s (type %d): %s\n",
prop_info->setting_info->general->setting_name,
prop_info->property_name,
prop_info->property_type->doc_format,
(int) prop_info->property_type->doc_format,
msg);
if (fatal)
g_error("%s", msg_full);
@ -248,10 +248,15 @@ append_int_valid_range(const NMMetaPropertyInfo *prop_info, GPtrArray *valid_val
NMMetaSignUnsignInt64 max;
nm_meta_property_int_get_range(prop_info, &min, &max);
if (NM_IN_SET(_property_get_gtype(prop_info), G_TYPE_UINT, G_TYPE_UINT64))
g_ptr_array_add(valid_values, g_strdup_printf("%lu - %lu", min.u64, max.u64));
else
g_ptr_array_add(valid_values, g_strdup_printf("%ld - %ld", min.i64, max.i64));
if (NM_IN_SET(_property_get_gtype(prop_info), G_TYPE_UINT, G_TYPE_UINT64)) {
g_ptr_array_add(
valid_values,
g_strdup_printf("%" G_GUINT64_FORMAT " - %" G_GUINT64_FORMAT, min.u64, max.u64));
} else {
g_ptr_array_add(
valid_values,
g_strdup_printf("%" G_GINT64_FORMAT " - %" G_GINT64_FORMAT, min.i64, max.i64));
}
}
static void
@ -442,11 +447,11 @@ append_int_special_values(const NMMetaPropertyInfo *prop_info, GPtrArray *specia
for (; v->nick != NULL; v++) {
char *v_str;
if (base == 16)
v_str = g_strdup_printf("%s (0x%lx)", v->nick, v->value.u64);
v_str = g_strdup_printf("%s (0x%" G_GINT64_MODIFIER "x)", v->nick, v->value.u64);
else if (is_uint)
v_str = g_strdup_printf("%s (%lu)", v->nick, v->value.u64);
v_str = g_strdup_printf("%s (%" G_GUINT64_FORMAT ")", v->nick, v->value.u64);
else
v_str = g_strdup_printf("%s (%ld)", v->nick, v->value.i64);
v_str = g_strdup_printf("%s (%" G_GINT64_FORMAT ")", v->nick, v->value.i64);
g_ptr_array_add(special_values, v_str);
}