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

clients: fix printing hexadecimal enum values

Browse source 
Use the 'x' conversion specifier for hexadecimal numbers.

Fixes: f53218ed7c ('cli: add property type for enum and showcase for ipv6.addr-gen-mode'):
(cherry picked from commit 420554a72e)
(cherry picked from commit 9fe7ef6ca3)
(cherry picked from commit d4141a1806)
This commit is contained in:
Beniamino Galvani 2019-06-26 17:57:06 +02:00
parent 0c9a6ff0ba
commit 449538d860
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/common/nm-meta-setting-desc.c
View file

@ -1000,7 +1000,7 @@ _get_fcn_gobject_enum (ARGS_GET_FCN)
s = format_numeric_hex
|| ( format_numeric_hex_unknown
&& !G_IS_ENUM_CLASS (gtype_class ?: (gtype_class = g_type_class_ref (gtype))))
? g_strdup_printf ("0x%"G_GINT64_FORMAT, v)
? g_strdup_printf ("0x%"G_GINT64_MODIFIER"x", v)
: g_strdup_printf ("%"G_GINT64_FORMAT, v);
RETURN_STR_TO_FREE (g_steal_pointer (&s));
}
@ -1018,7 +1018,7 @@ _get_fcn_gobject_enum (ARGS_GET_FCN)
if ( format_numeric_hex
|| ( format_numeric_hex_unknown
&& !G_IS_ENUM_CLASS (gtype_class ?: (gtype_class = g_type_class_ref (gtype)))))
nm_sprintf_buf (s_numeric, "0x%"G_GINT64_FORMAT, v);
nm_sprintf_buf (s_numeric, "0x%"G_GINT64_MODIFIER"x", v);
else
nm_sprintf_buf (s_numeric, "%"G_GINT64_FORMAT, v);