Date: Tue, 22 May 2012 09:14:27 -0500 From: Guy Helmer <guy.helmer@palisadesystems.com> To: Bruce Evans <brde@optusnet.com.au> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Guy Helmer <ghelmer@freebsd.org> Subject: Re: svn commit: r235739 - head/lib/libc/gen Message-ID: <41955DCF-552D-4E44-849D-8C2CD42D7B79@palisadesystems.com> In-Reply-To: <20120522163814.T1056@besplex.bde.org> References: <201205212104.q4LL4UDN072617@svn.freebsd.org> <20120522163814.T1056@besplex.bde.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On May 22, 2012, at 1:48 AM, Bruce Evans wrote:
> On Mon, 21 May 2012, Guy Helmer wrote:
>=20
>> Log:
>> Apply style(9) to return and switch/case statements.
>>=20
>> Reviewed by: delphij (prior version of the patch)
>>=20
>> Modified:
>> head/lib/libc/gen/getnetgrent.c
>>=20
>> Modified: head/lib/libc/gen/getnetgrent.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
>> --- head/lib/libc/gen/getnetgrent.c Mon May 21 19:58:40 2012 =
(r235738)
>> +++ head/lib/libc/gen/getnetgrent.c Mon May 21 21:04:29 2012 =
(r235739)
>> ...
>> @@ -311,32 +311,35 @@ _revnetgr_lookup(char* lookupdom, char*
>>=20
>> for (rot =3D 0; ; rot++) {
>> switch (rot) {
>> - case(0): snprintf(key, MAXHOSTNAMELEN, "%s.%s",
>> - str, dom?dom:lookupdom);
>> - break;
>> - case(1): snprintf(key, MAXHOSTNAMELEN, "%s.*",
>> - str);
>> - break;
>> - case(2): snprintf(key, MAXHOSTNAMELEN, "*.%s",
>> - dom?dom:lookupdom);
>> - break;
>> - case(3): snprintf(key, MAXHOSTNAMELEN, "*.*");
>> - break;
>> - default: return(0);
>> + case(0):
>> + snprintf(key, MAXHOSTNAMELEN, "%s.%s", str,
>> + dom ? dom : lookupdom);
>> + break;
>> + case(1):
>> + snprintf(key, MAXHOSTNAMELEN, "%s.*", str);
>> + break;
>> + case(2):
>> + snprintf(key, MAXHOSTNAMELEN, "*.%s",
>> + dom ? dom : lookupdom);
>> + break;
>> + case(3):
>> + snprintf(key, MAXHOSTNAMELEN, "*.*");
>> + break;
>=20
> Thanks, but a fuller application would have removed the obfuscatory
> parentheses that make case() look like a function call...
>=20
>> + default: return (0);
>=20
> ... and split the case statements after ":" in all cases.
>=20
>> }
>> y =3D yp_match(lookupdom, map, key, strlen(key), =
&result,
>> &resultlen);
>=20
> You fixed the continuation indentation in the case statement but not =
here.
>=20
>> if (y =3D=3D 0) {
>> rv =3D _listmatch(result, group, resultlen);
>> free(result);
>> - if (rv) return(1);
>> + if (rv) return (1);
>=20
> Another statement not started on a new line.
>=20
>> } else if (y !=3D YPERR_KEY) {
>> /*
>> * If we get an error other than 'no
>> * such key in map' then something is
>> * wrong and we should stop the search.
>> */
>> - return(-1);
>> + return (-1);
>> }
>> }
>> }
>=20
> These style bugs weren't in the CSRG version of course. The YP code =
added
> many. The most obvious ones are the case(n) and gnu-style =
continuation
> indentation.
>=20
I am not sure how to best resolve the long lines in the block of code to =
free grp->ng_str[] elements. The indentation is quite deep at that =
point, and breaking short statements over multiple lines would make the =
code quite ugly.
Would this resolve the other issues you pointed out?
Index: lib/libc/gen/getnetgrent.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
--- lib/libc/gen/getnetgrent.c (revision 235784)
+++ lib/libc/gen/getnetgrent.c (working copy)
@@ -309,28 +309,30 @@
=20
for (rot =3D 0; ; rot++) {
switch (rot) {
- case(0):
+ case 0:
snprintf(key, MAXHOSTNAMELEN, "%s.%s", str,
dom ? dom : lookupdom);
break;
- case(1):
+ case 1:
snprintf(key, MAXHOSTNAMELEN, "%s.*", str);
break;
- case(2):
+ case 2:
snprintf(key, MAXHOSTNAMELEN, "*.%s",
dom ? dom : lookupdom);
break;
- case(3):
+ case 3:
snprintf(key, MAXHOSTNAMELEN, "*.*");
break;
- default: return (0);
+ default:
+ return (0);
}
y =3D yp_match(lookupdom, map, key, strlen(key), =
&result,
- &resultlen);
+ &resultlen);
if (y =3D=3D 0) {
rv =3D _listmatch(result, group, resultlen);
free(result);
- if (rv) return (1);
+ if (rv)
+ return (1);
} else if (y !=3D YPERR_KEY) {
/*
* If we get an error other than 'no
@@ -418,7 +420,7 @@
parse_netgrp(const char *group)
{
char *spos, *epos;
- int len, strpos;
+ int len, strpos, freepos;
#ifdef DEBUG
int fields;
#endif
@@ -476,17 +478,16 @@
} else
len =3D strlen(spos);
if (len > 0) {
- grp->ng_str[strpos] =3D =
(char *)
- malloc(len + 1);
+ grp->ng_str[strpos] =3D
+ malloc(len + 1);
if (grp->ng_str[strpos] =
=3D=3D NULL) {
- int freepos;
for (freepos =3D =
0; freepos < strpos; freepos++)
=
free(grp->ng_str[freepos]);
free(grp);
return (1);
}
bcopy(spos, =
grp->ng_str[strpos],
- len + 1);
+ len + 1);
}
} else {
/*
@@ -508,13 +509,13 @@
* stay silent by default for compatibility's =
sake.
*/
if (fields < 3)
- fprintf(stderr, "Bad entry =
(%s%s%s%s%s) in netgroup \"%s\"\n",
- grp->ng_str[NG_HOST] =3D=3D=
NULL ? "" : grp->ng_str[NG_HOST],
- grp->ng_str[NG_USER] =3D=3D=
NULL ? "" : ",",
- grp->ng_str[NG_USER] =3D=3D=
NULL ? "" : grp->ng_str[NG_USER],
- grp->ng_str[NG_DOM] =3D=3D=
NULL ? "" : ",",
- grp->ng_str[NG_DOM] =3D=3D=
NULL ? "" : grp->ng_str[NG_DOM],
- lp->l_groupname);
+ fprintf(stderr, "Bad entry (%s%s%s%s%s) =
in netgroup \"%s\"\n",
+ grp->ng_str[NG_HOST] =3D=3D NULL ? =
"" : grp->ng_str[NG_HOST],
+ grp->ng_str[NG_USER] =3D=3D NULL ? =
"" : ",",
+ grp->ng_str[NG_USER] =3D=3D NULL ? =
"" : grp->ng_str[NG_USER],
+ grp->ng_str[NG_DOM] =3D=3D NULL ? "" =
: ",",
+ grp->ng_str[NG_DOM] =3D=3D NULL ? "" =
: grp->ng_str[NG_DOM],
+ lp->l_groupname);
#endif
} else {
spos =3D strsep(&pos, ", \t");
@@ -552,7 +553,7 @@
=
if(yp_get_default_domain(&_netgr_yp_domain))
continue;
if (yp_match(_netgr_yp_domain, "netgroup", =
group,
- strlen(group), &result, =
&resultlen)) {
+ strlen(group), &result, &resultlen)) {
free(result);
if (_use_only_yp)
return ((struct linelist *)0);
@@ -613,7 +614,7 @@
} else
cont =3D 0;
if (len > 0) {
- linep =3D (char =
*)reallocf(linep, olen + len + 1);
+ linep =3D reallocf(linep, olen + =
len + 1);
if (linep =3D=3D NULL) {
free(lp->l_groupname);
free(lp);
--------
This message has been scanned by ComplianceSafe, powered by Palisade's PacketSure.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41955DCF-552D-4E44-849D-8C2CD42D7B79>