summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2023-01-16 08:11:54 +0100
committerLubomir Rintel <lkundrak@v3.sk>2023-01-26 09:23:52 +0100
commit4591241d2845716ea80a71beb3f03f2535b0b986 (patch)
treebbcf18b6b13d81149dcb34868949347e84619b46
parentfbc48c361203d45bc4f07b3f1ebdc036d3e48b52 (diff)
downloadNetworkManager-4591241d2845716ea80a71beb3f03f2535b0b986.tar.gz
platform: don't negate lefthand argument in set comparison
This 1.) was ugly, 2.) makes it cumbersome to check for both positive and negative elements in one go. (cherry picked from commit 3f6d0402741d23579b2a082aa296f33babe4f98c)
-rw-r--r--src/libnm-platform/nm-linux-platform.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c
index eb7c671b7a..b309530803 100644
--- a/src/libnm-platform/nm-linux-platform.c
+++ b/src/libnm-platform/nm-linux-platform.c
@@ -7924,39 +7924,37 @@ retry:
nm_assert(seq_result);
- if (NM_IN_SET(-((int) seq_result), EOPNOTSUPP) && nlmsg_hdr(nlmsg)->nlmsg_type == RTM_NEWLINK) {
+ if (NM_IN_SET(seq_result, -EOPNOTSUPP) && nlmsg_hdr(nlmsg)->nlmsg_type == RTM_NEWLINK) {
nlmsg_hdr(nlmsg)->nlmsg_type = RTM_SETLINK;
goto retry;
}
if (seq_result == WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK) {
log_result = "success";
- } else if (NM_IN_SET(-((int) seq_result), EEXIST, EADDRINUSE)) {
+ } else if (NM_IN_SET(seq_result, -EEXIST, -EADDRINUSE)) {
/* */
- } else if (NM_IN_SET(-((int) seq_result), ESRCH, ENOENT)) {
+ } else if (NM_IN_SET(seq_result, -ESRCH, -ENOENT)) {
log_detail = ", firmware not found";
result = -NME_PL_NO_FIRMWARE;
- } else if (NM_IN_SET(-((int) seq_result), ERANGE)
- && change_link_type == CHANGE_LINK_TYPE_SET_MTU) {
+ } else if (NM_IN_SET(seq_result, -ERANGE) && change_link_type == CHANGE_LINK_TYPE_SET_MTU) {
log_detail = ", setting MTU to requested size is not possible";
result = -NME_PL_CANT_SET_MTU;
- } else if (NM_IN_SET(-((int) seq_result), ENFILE)
- && change_link_type == CHANGE_LINK_TYPE_SET_ADDRESS
+ } else if (NM_IN_SET(seq_result, -ENFILE) && change_link_type == CHANGE_LINK_TYPE_SET_ADDRESS
&& (obj_cache = nmp_cache_lookup_link(nm_platform_get_cache(platform), ifindex))
&& obj_cache->link.l_address.len == data->set_address.length
&& memcmp(obj_cache->link.l_address.data,
data->set_address.address,
data->set_address.length)
== 0) {
- /* workaround ENFILE which may be wrongly returned (bgo #770456).
+ /* work around ENFILE which may be wrongly returned (bgo #770456).
* If the MAC address is as expected, assume success? */
log_result = "success";
log_detail = " (assume success changing address)";
result = 0;
- } else if (NM_IN_SET(-((int) seq_result), ENODEV)) {
+ } else if (NM_IN_SET(seq_result, -ENODEV)) {
log_level = LOGL_DEBUG;
result = -NME_PL_NOT_FOUND;
- } else if (-((int) seq_result) == EAFNOSUPPORT) {
+ } else if (seq_result == -EAFNOSUPPORT) {
log_level = LOGL_DEBUG;
result = -NME_PL_OPNOTSUPP;
} else {