colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all/trivial: rename STRLEN() macro to NM_STRLEN()

Browse Source 
We should not have defines/macros in header files without a nm/NM
prefix. STRLEN() was one of the few offenders.

https://mail.gnome.org/archives/networkmanager-list/2016-February/msg00048.html
This commit is contained in:
Thomas Haller
2016-02-12 12:34:43 +01:00
parent afaa27ddbb
commit e663b88c59
28 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dhcp-manager/nm-dhcp-systemd.c
View File

@@ -146,7 +146,7 @@ take_option (GHashTable *options,
for (i = 0; requests[i].name; i++) {
if (requests[i].num == option) {
g_hash_table_insert (options,
(gpointer) (requests[i].name + STRLEN (REQPREFIX)),
(gpointer) (requests[i].name + NM_STRLEN (REQPREFIX)),
value);
break;
}
@@ -362,7 +362,7 @@ lease_to_ip4_config (const char *iface,
r = sd_dhcp_lease_get_vendor_specific (lease, &data, &data_len);
if (r >= 0)
metered = !!memmem (data, data_len, "ANDROID_METERED", STRLEN ("ANDROID_METERED"));
metered = !!memmem (data, data_len, "ANDROID_METERED", NM_STRLEN ("ANDROID_METERED"));
nm_ip4_config_set_metered (ip4_config, metered);
return ip4_config;