From: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] network-functions.pl : Compare correct variables in network_equal
Date: Tue, 24 Dec 2019 12:56:51 +0000 [thread overview]
Message-ID: <20191224125652.12232-3-ipfr@tfitzgeorge.me.uk> (raw)
In-Reply-To: <20191224125652.12232-1-ipfr@tfitzgeorge.me.uk>
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
Check result of network2bin is correct rather than checking non-existent
variable.
Signed-off-by: Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk>
---
config/cfgroot/network-functions.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl
index 56b4bceb7..a3f574760 100644
--- a/config/cfgroot/network-functions.pl
+++ b/config/cfgroot/network-functions.pl
@@ -111,7 +111,7 @@ sub network_equal {
my @bin1 = &network2bin($network1);
my @bin2 = &network2bin($network2);
- if (!defined $bin1 || !defined $bin2) {
+ if (@bin1 != 2 || @bin2 != 2) {
return undef;
}
--
2.16.4
next prev parent reply other threads:[~2019-12-24 12:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-24 12:56 [PATCH 0/3] network-functions.pl : Correct comparisons and enhance testsuite Tim FitzGeorge
2019-12-24 12:56 ` [PATCH 1/3] network-functions.pl : Enhance testsuite to show cause of error Tim FitzGeorge
2019-12-24 12:56 ` Tim FitzGeorge [this message]
2019-12-24 13:04 ` [PATCH 2/3] network-functions.pl : Compare correct variables in network_equal Michael Tremer
2019-12-28 20:57 ` Tim FitzGeorge
2020-01-06 17:16 ` Michael Tremer
2020-01-06 17:33 ` Aw: " Bernhard Bitsch
2020-01-06 18:57 ` Michael Tremer
2019-12-24 12:56 ` [PATCH 3/3] network-functions.pl : Use integer comparison rather than string Tim FitzGeorge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191224125652.12232-3-ipfr@tfitzgeorge.me.uk \
--to=ipfr@tfitzgeorge.me.uk \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox