diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2021-12-17 20:16:18 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-18 08:36:07 +0900 |
| commit | c0a2e0cc24491a4f4dbf5ad49aec2507f75ee8e3 (patch) | |
| tree | 007415b9e50cbaac98a2e4c94c9a752c074d3d81 /src | |
| parent | 14dd873b88fcaafc79613ec861a512eaca1b2884 (diff) | |
| download | systemd-c0a2e0cc24491a4f4dbf5ad49aec2507f75ee8e3.tar.gz | |
network: a couple of tweaks suggested by Coccinelle
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/netdev/ipoib.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-address-generation.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c index c3f583fc46..e0ff9e8c62 100644 --- a/src/network/netdev/ipoib.c +++ b/src/network/netdev/ipoib.c @@ -139,7 +139,7 @@ int config_parse_ipoib_pkey( rvalue); return 0; } - if (u == 0 || u == 0x8000) { + if (IN_SET(u, 0, 0x8000)) { log_syntax(unit, LOG_WARNING, filename, line, 0, "IPoIB pkey cannot be 0 nor 0x8000, ignoring assignment: %s", rvalue); diff --git a/src/network/networkd-address-generation.c b/src/network/networkd-address-generation.c index c9c53b22cc..85110355a1 100644 --- a/src/network/networkd-address-generation.c +++ b/src/network/networkd-address-generation.c @@ -358,10 +358,9 @@ int config_parse_address_generation_type( addr = addr_alloc; } - } else if (*addr == ',') { - comma = addr; - addr = NULL; - } else if (*addr == '\0') { + } else if (*addr == ',') + comma = TAKE_PTR(addr); + else if (*addr == '\0') { comma = NULL; addr = NULL; } else { |