Date: Sat, 31 Oct 2020 13:14:33 +0100 From: Stefan Esser <se@freebsd.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r367196 - head/lib/libc/gen Message-ID: <ceca859b-6f03-367d-71ae-6092a293d125@freebsd.org> In-Reply-To: <AM0PR06MB398665BACEE7BAE8CAC52902C0120@AM0PR06MB3986.eurprd06.prod.outlook.com> References: <202010311144.09VBiBbh063210@repo.freebsd.org> <AM0PR06MB398665BACEE7BAE8CAC52902C0120@AM0PR06MB3986.eurprd06.prod.outlook.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ssSGJEIwFEAn0ESPDRlKBbblrGriSQhgO Content-Type: multipart/mixed; boundary="0VX0hvZpHEDLx27FpKmtaGqjxpvZcEXh8"; protected-headers="v1" From: Stefan Esser <se@freebsd.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <ceca859b-6f03-367d-71ae-6092a293d125@freebsd.org> Subject: Re: svn commit: r367196 - head/lib/libc/gen References: <202010311144.09VBiBbh063210@repo.freebsd.org> <AM0PR06MB398665BACEE7BAE8CAC52902C0120@AM0PR06MB3986.eurprd06.prod.outlook.com> In-Reply-To: <AM0PR06MB398665BACEE7BAE8CAC52902C0120@AM0PR06MB3986.eurprd06.prod.outlook.com> --0VX0hvZpHEDLx27FpKmtaGqjxpvZcEXh8 Content-Type: multipart/mixed; boundary="------------41238D8B78E053E11E01C409" Content-Language: en-US This is a multi-part message in MIME format. --------------41238D8B78E053E11E01C409 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Sorry for the bad bug that I introduced with this attempted style fix! The correct code has been committed as r367199. Am 31.10.20 um 12:46 schrieb xtouqh@hotmail.com: > Stefan E=C3=9Fer wrote: >> Author: se >> Date: Sat Oct 31 11:44:10 2020 >> New Revision: 367196 >> URL: https://svnweb.freebsd.org/changeset/base/367196 >> >> Log: >> =C2=A0=C2=A0 Fix style, no functional change >> =C2=A0=C2=A0 Submitted by:=C2=A0=C2=A0=C2=A0 kib >> =C2=A0=C2=A0 MFC after:=C2=A0=C2=A0=C2=A0 3 days >> >> Modified: >> =C2=A0=C2=A0 head/lib/libc/gen/sysctl.c >> >> Modified: head/lib/libc/gen/sysctl.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=20 >> >> --- head/lib/libc/gen/sysctl.c=C2=A0=C2=A0=C2=A0 Sat Oct 31 03:36:31 2= 020=C2=A0=C2=A0=C2=A0 (r367195) >> +++ head/lib/libc/gen/sysctl.c=C2=A0=C2=A0=C2=A0 Sat Oct 31 11:44:10 2= 020=C2=A0=C2=A0=C2=A0 (r367196) >> @@ -79,23 +79,23 @@ sysctl(const int *name, u_int namelen, void *oldp,= =20 >> siz >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 switch (name[1]) { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 case USER_CS_PATH: >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (oldp && orig_oldlen < = sizeof(_PATH_STDPATH)) { >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (oldp =3D=3D NULL && or= ig_oldlen < sizeof(_PATH_STDPATH)) { >=20 > These checks are not identical, should not the new one be !=3D NULL? >=20 >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 errno =3D ENOMEM; >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 re= turn -1; >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 re= turn (-1); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *oldlenp =3D si= zeof(_PATH_STDPATH); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (oldp !=3D N= ULL) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 memmove(oldp, _PATH_STDPATH, sizeof(_PATH_STDPATH)); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return (0); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 case USER_LOCALBASE: >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (oldp && orig_oldlen < = sizeof(_PATH_LOCALBASE)) { >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (oldp =3D=3D NULL && or= ig_oldlen < sizeof(_PATH_LOCALBASE)) { >=20 > Same here. >=20 >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 errno =3D ENOMEM; >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 re= turn -1; >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 re= turn (-1); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *oldlenp =3D si= zeof(_PATH_LOCALBASE); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (oldp !=3D N= ULL) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 memmove(oldp, _PATH_LOCALBASE, sizeof(_PATH_LOCALBASE)); >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return(0); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return (0); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (oldp && *oldlenp < sizeof(int)) { >=20 --------------41238D8B78E053E11E01C409-- --0VX0hvZpHEDLx27FpKmtaGqjxpvZcEXh8-- --ssSGJEIwFEAn0ESPDRlKBbblrGriSQhgO Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAl+dVSkFAwAAAAAACgkQR+u171r99USK DQf/YTlx8AqjmP/WUYFMVpbXzQv3Ee5mGGJnnqnmp8twKFTZH3O8aXOS/oTuVgVyaHL6qxFtzbW6 A+FrP3ckfwRVZRr0uwF4/gMeyQn00bRGDxUTY3YPFTr+245TZmseHOeuVJsafx8HoynVWvpc4Clv x+M1sAE8LuOWc/e4CeL6/IBH+6FegxfnOY1EXWfvN6uq1x90wQbi9T3xD9ovsVYa3mUnFhqnu7tu ZA/bnIz6n3+FMGVh0QY3Bu5F2RtgMYXyfKcK4rAb/XK1c9UPMqmrCIga/GORBYwTQ9bkhOOKJbWv 1f7Uav0nQynsDoqCRhZRkgo5lgyfYCARCLS7xcMr0A== =4BxE -----END PGP SIGNATURE----- --ssSGJEIwFEAn0ESPDRlKBbblrGriSQhgO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ceca859b-6f03-367d-71ae-6092a293d125>