From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 17 Feb 2017 14:34:25 +0000 (-0500)
Subject: network: change condition in if testing section presence
X-Git-Tag: v233~78^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5275%2Fhead;p=thirdparty%2Fsystemd.git

network: change condition in if testing section presence

section_line and filename should be set together or not at all. Change the
if to test filename, since it's the first of the pair and it seems more natural
to test that.
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 9e41244eb74..9d0311d76f9 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -60,8 +60,9 @@ int address_new_static(Network *network, const char *filename, unsigned section_
 
         assert(network);
         assert(ret);
+        assert(!!filename == (section_line > 0));
 
-        if (section_line > 0) {
+        if (filename) {
                 r = network_config_section_new(filename, section_line, &n);
                 if (r < 0)
                         return r;
@@ -82,7 +83,7 @@ int address_new_static(Network *network, const char *filename, unsigned section_
         if (r < 0)
                 return r;
 
-        if (section_line > 0) {
+        if (filename) {
                 address->section = n;
                 hashmap_put(network->addresses_by_section, n, address);
         }
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index ca606c3d25a..a8ba293ae8a 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -84,8 +84,9 @@ int route_new_static(Network *network, const char *filename, unsigned section_li
 
         assert(network);
         assert(ret);
+        assert(!!filename == (section_line > 0));
 
-        if (section_line > 0) {
+        if (filename) {
                 r = network_config_section_new(filename, section_line, &n);
                 if (r < 0)
                         return r;
@@ -108,7 +109,7 @@ int route_new_static(Network *network, const char *filename, unsigned section_li
 
         route->protocol = RTPROT_STATIC;
 
-        if (section_line > 0) {
+        if (filename) {
                 route->section = n;
                 n = NULL;