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

shared,libnm: avoid mixing signed and unsigned integers in netmask_to_prefix()/prefix_to_netmask()

Browse source
This commit is contained in:
Thomas Haller 2020-09-24 11:04:35 +02:00
parent 613f74b545
commit 3aca45ed55
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnm-core/nm-utils.c
View file

@ -1623,9 +1623,9 @@ nm_utils_ip4_netmask_to_prefix (guint32 netmask)
G_STATIC_ASSERT_EXPR (sizeof (int) == 4);
G_STATIC_ASSERT_EXPR (sizeof (netmask) == 4);
return ( (netmask != 0)
? (32 - __builtin_ctz (ntohl (netmask)))
: 0);
return ( (netmask != 0u)
? (guint32) (32 - __builtin_ctz (ntohl (netmask)))
: 0u);
}
/**

2
shared/nm-glib-aux/nm-shared-utils.c
View file

@ -656,7 +656,7 @@ nm_utils_flags2str (const NMUtilsFlags2StrDesc *descs,
guint32
_nm_utils_ip4_prefix_to_netmask (guint32 prefix)
{
return prefix < 32 ? ~htonl(0xFFFFFFFF >> prefix) : 0xFFFFFFFF;
return prefix < 32 ? ~htonl(0xFFFFFFFFu >> prefix) : 0xFFFFFFFFu;
}
gconstpointer