From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/3] network-functions.pl : Compare correct variables in
 network_equal
Date: Mon, 06 Jan 2020 17:16:51 +0000
Message-ID: <370BAEAB-C60F-4786-8645-B2BC0D1C8827@ipfire.org>
In-Reply-To: <a2fbd02c-9c20-351f-54b2-5f236d1f583a@tfitzgeorge.me.uk>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0784303180249293880=="
List-Id: <development.lists.ipfire.org>

--===============0784303180249293880==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Okay.

Did I say that I hate Perl?

I suppose if you tested this, it works. And it must have worked at some point=
 before, because there was a test suite.

Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>

-Michael

> On 28 Dec 2019, at 20:57, Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk> wrote:
>=20
> Hello,
>=20
> On 24/12/2019 13:04, Michael Tremer wrote:
>> Hello,
>>=20
>> I am still not sure what you are trying to solve here.
>>=20
>> &network2bin() has two possible return values:
>>=20
>> 1) An array with two values
>>=20
>> Or
>>=20
>> 2) Undefined
>=20
> No. It's called in array context so the return value in the latter case
> is the list ( undef ).
>=20
>>=20
>> You are now checking if you have an array with any length but two, but thi=
s won=E2=80=99t work for undefined. That should at least print a warning that=
 you are trying to determine the length of an undefined array.
>>=20
>> So why is this change needed?
>=20
> Partly because the return value is an array and partly because the
> original code checked the scalar variables $bin1 and $bin2 rather than
> the arrays @bin1 and @bin2 containing the return values; since these
> scalars aren't used anywhere, network_equal() always returned undef,
> which is actually the root cause of my original problem.
>=20
> Tim
>=20
>>=20
>> -Michael
>>=20
>>> On 24 Dec 2019, at 13:56, Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk> wrote:
>>>=20
>>> Check result of network2bin is correct rather than checking non-existent
>>> variable.
>>>=20
>>> Signed-off-by: Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk>
>>> ---
>>> config/cfgroot/network-functions.pl | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>=20
>>> 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 =3D &network2bin($network1);
>>> 	my @bin2 =3D &network2bin($network2);
>>>=20
>>> -	if (!defined $bin1 || !defined $bin2) {
>>> +	if (@bin1 !=3D 2 || @bin2 !=3D 2) {
>>> 		return undef;
>>> 	}
>>>=20
>>> --=20
>>> 2.16.4
>>>=20
>>=20
>=20


--===============0784303180249293880==--