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

platform: use NM_STR_HAS_PREFIX() where appropriate

Browse source 
Prefer it over strncmp(), because it seems easier to understand (to me).

Prefer it over g_str_has_prefix(), because it can directly expand
to a plain strncmp() -- instead of first humping to glib, then calling
strlen() before calling strncmp().
This commit is contained in:
Thomas Haller 2022-09-28 09:53:35 +02:00
parent 46fdf8a40e
commit 93ec6abf16
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/libnm-platform/nm-linux-platform.c
View file

@ -1155,7 +1155,7 @@ _linktype_read_devtype(int dirfd)
end = strpbrk(cont, "\r\n");
if (end)
*end++ = '\0';
if (strncmp(cont, DEVTYPE_PREFIX, NM_STRLEN(DEVTYPE_PREFIX)) == 0) {
if (NM_STR_HAS_PREFIX(cont, DEVTYPE_PREFIX)) {
cont += NM_STRLEN(DEVTYPE_PREFIX);
memmove(contents, cont, strlen(cont) + 1);
return g_steal_pointer(&contents);
@ -1310,8 +1310,8 @@ _linktype_get_type(NMPlatform *platform,
ARPHRD_ETHER,
519 /* ARPHRD_RAWIP */,
530 /* out-of-tree ARPHRD_RAWIP */)) {
if (g_str_has_prefix(ifname, "rmnet") || g_str_has_prefix(ifname, "rev_rmnet")
|| g_str_has_prefix(ifname, "ccmni"))
if (NM_STR_HAS_PREFIX(ifname, "rmnet") || NM_STR_HAS_PREFIX(ifname, "rev_rmnet")
|| NM_STR_HAS_PREFIX(ifname, "ccmni"))
return NM_LINK_TYPE_WWAN_NET;
}
@ -5520,25 +5520,25 @@ nla_put_failure:
/*****************************************************************************/
#define ASSERT_SYSCTL_ARGS(pathid, dirfd, path) \
G_STMT_START \
{ \
const char *const _pathid = (pathid); \
const int _dirfd = (dirfd); \
const char *const _path = (path); \
\
nm_assert(_path &&_path[0]); \
g_assert(!strstr(_path, "/../")); \
if (_dirfd < 0) { \
nm_assert(!_pathid); \
nm_assert(_path[0] == '/'); \
nm_assert(g_str_has_prefix(_path, "/proc/sys/") || g_str_has_prefix(_path, "/sys/") \
|| g_str_has_prefix(_path, "/proc/net")); \
} else { \
nm_assert(_pathid &&_pathid[0] && _pathid[0] != '/'); \
nm_assert(_path[0] != '/'); \
} \
} \
#define ASSERT_SYSCTL_ARGS(pathid, dirfd, path) \
G_STMT_START \
{ \
const char *const _pathid = (pathid); \
const int _dirfd = (dirfd); \
const char *const _path = (path); \
\
nm_assert(_path &&_path[0]); \
g_assert(!strstr(_path, "/../")); \
if (_dirfd < 0) { \
nm_assert(!_pathid); \
nm_assert(_path[0] == '/'); \
nm_assert(NM_STR_HAS_PREFIX(_path, "/proc/sys/") || NM_STR_HAS_PREFIX(_path, "/sys/") \
|| NM_STR_HAS_PREFIX(_path, "/proc/net")); \
} else { \
nm_assert(_pathid &&_pathid[0] && _pathid[0] != '/'); \
nm_assert(_path[0] != '/'); \
} \
} \
G_STMT_END
/*****************************************************************************/