From 48317c39e26a203dc62d1f707263c75a79f89259 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 17 Feb 2017 09:34:25 -0500 Subject: [PATCH] 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. --- src/network/networkd-address.c | 5 +++-- src/network/networkd-route.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 9e41244..9d0311d 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 ca606c3..a8ba293 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; -- 2.7.4