From owner-svn-src-all@FreeBSD.ORG Tue May 22 14:20:08 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A597106566C; Tue, 22 May 2012 14:20:08 +0000 (UTC) (envelope-from guy.helmer@palisadesystems.com) Received: from ps-1-a.compliancesafe.com (ps-1-a.compliancesafe.com [216.81.161.161]) by mx1.freebsd.org (Postfix) with ESMTP id 466628FC18; Tue, 22 May 2012 14:20:08 +0000 (UTC) Received: from mail.palisadesystems.com (localhost [127.0.0.1]) by ps-1-a.compliancesafe.com (8.14.4/8.14.3) with ESMTP id q4MEEfT5044659; Tue, 22 May 2012 09:14:41 -0500 (CDT) (envelope-from guy.helmer@palisadesystems.com) Received: from guysmbp.dyn.palisadesys.com (GuysMBP.dyn.palisadesys.com [172.16.2.90]) (authenticated bits=0) by mail.palisadesystems.com (8.14.3/8.14.3) with ESMTP id q4MEERTe036305 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Tue, 22 May 2012 09:14:28 -0500 (CDT) (envelope-from guy.helmer@palisadesystems.com) X-DKIM: Sendmail DKIM Filter v2.8.3 mail.palisadesystems.com q4MEERTe036305 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=palisadesystems.com; s=mail; t=1337696068; bh=9fY61Zwtw1yqm5BqFEQl/RTKjKKMrodLe2ejqn4XSYk=; l=128; h=Subject:Mime-Version:Content-Type:From:In-Reply-To:Date:Cc: Content-Transfer-Encoding:Message-Id:References:To; b=BsH6WQT6QcINcM1LmeUh1KkJGQVEHoYnFQWv6//iyFwtoMshM2Aq1sBhNXxCPLPEj u2uzCKOjwc5geQnm+Y3DvzZ0YF83pw3GLLT+ve1qeIly2bOl+yM7mExwUFT0BAKE9O ASGy7HNXlCxqtSUfhwimXDm0zzBwwx8W+Y0JFzpA= Mime-Version: 1.0 (Apple Message framework v1278) Content-Type: text/plain; charset=us-ascii From: Guy Helmer In-Reply-To: <20120522163814.T1056@besplex.bde.org> Date: Tue, 22 May 2012 09:14:27 -0500 Content-Transfer-Encoding: quoted-printable Message-Id: <41955DCF-552D-4E44-849D-8C2CD42D7B79@palisadesystems.com> References: <201205212104.q4LL4UDN072617@svn.freebsd.org> <20120522163814.T1056@besplex.bde.org> To: Bruce Evans X-Mailer: Apple Mail (2.1278) X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.5 (mail.palisadesystems.com [172.16.1.5]); Tue, 22 May 2012 09:14:28 -0500 (CDT) X-Palisade-MailScanner-Information: Please contact the ISP for more information X-Palisade-MailScanner-ID: q4MEERTe036305 X-Palisade-MailScanner: Found to be clean X-Palisade-MailScanner-SpamCheck: not spam (whitelisted), SpamAssassin (score=0.884, required 5, ALL_TRUSTED -1.00, BAYES_00 -1.90, J_CHICKENPOX_54 0.60, J_CHICKENPOX_63 0.60, J_CHICKENPOX_83 0.60, RP_8BIT 1.98) X-Palisade-MailScanner-From: guy.helmer@palisadesystems.com X-Spam-Status: No X-PacketSure-Scanned: Yes Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Guy Helmer Subject: Re: svn commit: r235739 - head/lib/libc/gen X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2012 14:20:08 -0000 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.