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

platform: use nm_streq() instead of strcmp()

Browse Source
This commit is contained in:
Thomas Haller
2020-02-20 12:32:26 +01:00
parent acb397c995
commit 6dcb4bd308
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/platform/nm-linux-platform.c
View File

@@ -1042,7 +1042,7 @@ _linktype_get_type (NMPlatform *platform,
obj = _lookup_cached_link (cache, ifindex, completed_from_cache, link_cached); obj = _lookup_cached_link (cache, ifindex, completed_from_cache, link_cached);
/* If we detected the link type before, we stick to that /* If we detected the link type before, we stick to that
* decision unless the "kind" no "name" changed. If "name" changed, * decision unless the "kind" or "name" changed. If "name" changed,
* it means that their type may not have been determined correctly * it means that their type may not have been determined correctly
* due to race conditions while accessing sysfs. * due to race conditions while accessing sysfs.
* *
@@ -1157,13 +1157,14 @@ _linktype_get_type (NMPlatform *platform,
*/ */
if (!kind && !devtype) if (!kind && !devtype)
return NM_LINK_TYPE_ETHERNET; return NM_LINK_TYPE_ETHERNET;
/* The USB gadget interfaces behave and look like ordinary ethernet devices /* The USB gadget interfaces behave and look like ordinary ethernet devices
* aside from the DEVTYPE. */ * aside from the DEVTYPE. */
if (!g_strcmp0 (devtype, "gadget")) if (nm_streq0 (devtype, "gadget"))
return NM_LINK_TYPE_ETHERNET; return NM_LINK_TYPE_ETHERNET;
/* Distributed Switch Architecture switch chips */ /* Distributed Switch Architecture switch chips */
if (!g_strcmp0 (devtype, "dsa")) if (nm_streq0 (devtype, "dsa"))
return NM_LINK_TYPE_ETHERNET; return NM_LINK_TYPE_ETHERNET;
} }
} }
@@ -4653,7 +4654,7 @@ _nl_msg_new_qdisc (int nlmsg_type,
if (!(tc_options = nla_nest_start (msg, TCA_OPTIONS))) if (!(tc_options = nla_nest_start (msg, TCA_OPTIONS)))
goto nla_put_failure; goto nla_put_failure;
if (strcmp (qdisc->kind, "fq_codel") == 0) { if (nm_streq (qdisc->kind, "fq_codel")) {
if (qdisc->fq_codel.limit) if (qdisc->fq_codel.limit)
NLA_PUT_U32 (msg, TCA_FQ_CODEL_LIMIT, qdisc->fq_codel.limit); NLA_PUT_U32 (msg, TCA_FQ_CODEL_LIMIT, qdisc->fq_codel.limit);
if (qdisc->fq_codel.flows) if (qdisc->fq_codel.flows)