Re: [PATCH 1/1] all/trivial: rename STRLEN() macro to NM_STRLEN()
On Fri, 2016-02-12 at 10:29 -0600, Dan Williams wrote: > On Fri, 2016-02-12 at 12:34 +0100, Thomas Haller wrote: > > We should not have defines/macros in header files without a nm/NM > > prefix. > > STRLEN() was one of the few offendors. > > --- > > LGTM. > > Dan Merged: https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=e663b88c59a6891c9f2b5a41f50c11033e5d0364 Thomas signature.asc Description: This is a digitally signed message part ___ networkmanager-list mailing list networkmanager-list@gnome.org https://mail.gnome.org/mailman/listinfo/networkmanager-list
Re: [PATCH 1/1] all/trivial: rename STRLEN() macro to NM_STRLEN()
On Fri, 2016-02-12 at 12:34 +0100, Thomas Haller wrote: > We should not have defines/macros in header files without a nm/NM > prefix. > STRLEN() was one of the few offendors. > --- LGTM. Dan > clients/cli/settings.c| 8 ++--- > libnm-core/nm-keyfile-reader.c| 12 > libnm-core/nm-setting-8021x.c | 8 ++--- > libnm-core/nm-utils.c | 2 +- > libnm-core/tests/test-keyfile.c | 4 +-- > libnm-util/nm-setting-8021x.c | 8 ++--- > libnm-util/nm-utils.c | 2 +- > shared/nm-macros-internal.h | 2 +- > src/NetworkManagerUtils.c | 36 +++ > > src/dhcp-manager/nm-dhcp-client.c | 2 +- > src/dhcp-manager/nm-dhcp-dhclient-utils.c | 6 ++-- > src/dhcp-manager/nm-dhcp-systemd.c| 4 +-- > src/dhcp-manager/tests/test-dhcp-dhclient.c | 4 +-- > src/nm-config-data.c | 10 +++ > src/nm-config.c | 10 +++ > src/nm-dispatcher.c | 2 +- > src/nm-logging.c | 2 +- > src/nm-route-manager.c| 2 +- > src/platform/nm-linux-platform.c | 4 +-- > src/platform/nm-platform-utils.c | 4 +-- > src/platform/nm-platform.c| 6 ++-- > src/settings/nm-settings.c| 4 +-- > src/settings/plugins/ibft/reader.c| 4 +-- > src/settings/plugins/ifcfg-rh/reader.c| 2 +- > src/settings/plugins/ifcfg-rh/utils.c | 8 ++--- > src/settings/plugins/ifnet/net_utils.c| 2 +- > src/settings/plugins/keyfile/tests/test-keyfile.c | 6 ++-- > src/tests/test-general.c | 4 +-- > 28 files changed, 84 insertions(+), 84 deletions(-) > > diff --git a/clients/cli/settings.c b/clients/cli/settings.c > index baf0a92..fc7e0c6 100644 > --- a/clients/cli/settings.c > +++ b/clients/cli/settings.c > @@ -3328,8 +3328,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, \ > @@ -3350,8 +3350,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]; \ > diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile- > reader.c > index 6a0584a..41cd9a7 100644 > --- a/libnm-core/nm-keyfile-reader.c > +++ b/libnm-core/nm-keyfile-reader.c > @@ -874,17 +874,17 @@ handle_as_scheme (KeyfileReaderInfo *info, > GBytes *bytes, NMSetting *setting, co > > /* It's the PATH scheme, can just set plain data. > * In this case, @data_len includes */ > - if ( data_len >= STRLEN > (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH) > + if ( data_len >= NM_STRLEN > (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH) > && g_str_has_prefix (data, > NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)) { > if (nm_setting_802_1x_check_cert_scheme (data, > data_len + 1, NULL) == NM_SETTING_802_1X_CK_SCHEME_PATH) { > - const char *path = &data[STRLEN > (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)]; > + const char *path = &data[NM_STRLEN > (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)]; > gs_free char *path_free = NULL; > > if (path[0] != '/') { > /* we want to read absolute paths > because we use keyfile as exchange > * between different processes which > might not ha
[PATCH 1/1] 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 offendors. --- clients/cli/settings.c| 8 ++--- libnm-core/nm-keyfile-reader.c| 12 libnm-core/nm-setting-8021x.c | 8 ++--- libnm-core/nm-utils.c | 2 +- libnm-core/tests/test-keyfile.c | 4 +-- libnm-util/nm-setting-8021x.c | 8 ++--- libnm-util/nm-utils.c | 2 +- shared/nm-macros-internal.h | 2 +- src/NetworkManagerUtils.c | 36 +++ src/dhcp-manager/nm-dhcp-client.c | 2 +- src/dhcp-manager/nm-dhcp-dhclient-utils.c | 6 ++-- src/dhcp-manager/nm-dhcp-systemd.c| 4 +-- src/dhcp-manager/tests/test-dhcp-dhclient.c | 4 +-- src/nm-config-data.c | 10 +++ src/nm-config.c | 10 +++ src/nm-dispatcher.c | 2 +- src/nm-logging.c | 2 +- src/nm-route-manager.c| 2 +- src/platform/nm-linux-platform.c | 4 +-- src/platform/nm-platform-utils.c | 4 +-- src/platform/nm-platform.c| 6 ++-- src/settings/nm-settings.c| 4 +-- src/settings/plugins/ibft/reader.c| 4 +-- src/settings/plugins/ifcfg-rh/reader.c| 2 +- src/settings/plugins/ifcfg-rh/utils.c | 8 ++--- src/settings/plugins/ifnet/net_utils.c| 2 +- src/settings/plugins/keyfile/tests/test-keyfile.c | 6 ++-- src/tests/test-general.c | 4 +-- 28 files changed, 84 insertions(+), 84 deletions(-) diff --git a/clients/cli/settings.c b/clients/cli/settings.c index baf0a92..fc7e0c6 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -3328,8 +3328,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, \ @@ -3350,8 +3350,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]; \ diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c index 6a0584a..41cd9a7 100644 --- a/libnm-core/nm-keyfile-reader.c +++ b/libnm-core/nm-keyfile-reader.c @@ -874,17 +874,17 @@ handle_as_scheme (KeyfileReaderInfo *info, GBytes *bytes, NMSetting *setting, co /* It's the PATH scheme, can just set plain data. * In this case, @data_len includes */ - if ( data_len >= STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH) + if ( data_len >= NM_STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH) && g_str_has_prefix (data, NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)) { if (nm_setting_802_1x_check_cert_scheme (data, data_len + 1, NULL) == NM_SETTING_802_1X_CK_SCHEME_PATH) { - const char *path = &data[STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)]; + const char *path = &data[NM_STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)]; gs_free char *path_free = NULL; if (path[0] != '/') { /* we want to read absolute paths because we use keyfile as exchange * between different processes which might not have the same cwd. */ path = path_free = get_cert_path (info->base_dir, (const guint8 *) path, - dat