all/trivial: rename STRLEN() macro to NM_STRLEN()
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:
@@ -3298,8 +3298,8 @@ nmc_property_connection_set_lldp (NMSetting *setting, const char *prop,
|
||||
char *p = val_strip; \
|
||||
gboolean success; \
|
||||
\
|
||||
if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \
|
||||
p += STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \
|
||||
if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \
|
||||
p += NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \
|
||||
\
|
||||
success = set_func (NM_SETTING_802_1X (setting), \
|
||||
p, \
|
||||
@@ -3320,8 +3320,8 @@ nmc_property_connection_set_lldp (NMSetting *setting, const char *prop,
|
||||
const char *path, *password; \
|
||||
gboolean success; \
|
||||
\
|
||||
if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \
|
||||
p += STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \
|
||||
if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \
|
||||
p += NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \
|
||||
\
|
||||
strv = nmc_strsplit_set (p, " \t,", 2); \
|
||||
path = strv[0]; \
|
||||
|
Reference in New Issue
Block a user