From owner-svn-src-all@freebsd.org Wed Apr 20 01:29:41 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF5D9B14E5B for ; Wed, 20 Apr 2016 01:29:41 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm47-vm9.bullet.mail.bf1.yahoo.com (nm47-vm9.bullet.mail.bf1.yahoo.com [216.109.114.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 991611DC6 for ; Wed, 20 Apr 2016 01:29:41 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1461115446; bh=uNBqOJtVj2xO4eAKEC+GEcTWapkpLJDSvhHqcunCgds=; h=Subject:To:References:From:Date:In-Reply-To:From:Subject; b=ArrBVJsM/RhzeNKm4uqcsKTbKGuJwqHUj6FodIEOPM2ELgwgK0/f6x7bWjgoPlgc1Ay2PL3ShZrz9UqrgAH5jJY7rcIVeUs3gCKL/HFHtsGnF84P1thYJmtmZEAApHAy1fYhAr0yA60eXyUJK6ArhlyoJh047yoLRxAC2EnbjUm6X5rq1z+UFSmrr5Mbn6jyke2TN0nZZXPbQuggiKl51AcXbUe4fjwQsTGot/CDZtyzzRZSMzMQfRFYBFWbcft1WDQPLdNqb1Cpy2KbEPB7+KdXenEMLPja6H+F8H+45DOjx3F5Kk1mn1LolIL9YadU3v/lz8xD4syZh1zGjbNlvQ== Received: from [98.139.170.182] by nm47.bullet.mail.bf1.yahoo.com with NNFMP; 20 Apr 2016 01:24:06 -0000 Received: from [98.139.211.200] by tm25.bullet.mail.bf1.yahoo.com with NNFMP; 20 Apr 2016 01:24:06 -0000 Received: from [127.0.0.1] by smtp209.mail.bf1.yahoo.com with NNFMP; 20 Apr 2016 01:24:06 -0000 X-Yahoo-Newman-Id: 225365.71839.bm@smtp209.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: dTbJ4mkVM1lZhQqHhsxetoc59N3hRvJ1i90gSzBdQ7Tuqsp dhqUCVmVphXoYLRF06Dh1hgFZ.2m_wYTRDGaiFj5JULAsaD2ybT7AhyDM9tM jtwVIs2SZ2Atm.8FemBonKYOTSyx_4uO0.N9pK_dIvrRnr6NpK_pjtxKItEk BqF_Ta9RUFG3gQiH7VJ8EPoGZgq7WYGTcN8orQMH0EVMZqzarGv4I2eNJP_r kVAHmQCCwnyRZS1td3Zmx0xl0a6aBp2ZENeqpvxrCr.0bQwCP1kls.y3yCbb 8mophQoR_GuXtvP0ILZXJr2yUj1_wSSrW4t.RtwQbpJWpJSSgc43u9eXaB7b gGd_MK2JGA1WS0cX8eHtECZ27U7cMTWLRPM9gNnKyIJS2kGdYW6pb6VGdSaq t7lvr.W.zucEpx5agCWv2msJ4wSliKospVOqfz1PK24zGRtiOtCdBuxULZFE Kay0D2vqdEdGDU1REZZHUMlEUSukOYkwkr8uThIYuNH3aYHyLWYOmTAhUh8A 6yampG2I534gkk2m3zlrP0JRzezeO2Dpu X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Subject: Re: svn commit: r298320 - head/sbin/sunlabel To: Marcelo Araujo , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201604200105.u3K15sCP021936@repo.freebsd.org> From: Pedro Giffuni Message-ID: <81a0edfd-67cf-5049-a4d7-f6b5e517f529@FreeBSD.org> Date: Tue, 19 Apr 2016 20:24:08 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 In-Reply-To: <201604200105.u3K15sCP021936@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 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: Wed, 20 Apr 2016 01:29:42 -0000 On 04/19/16 20:05, Marcelo Araujo wrote: > Author: araujo > Date: Wed Apr 20 01:05:54 2016 > New Revision: 298320 > URL: https://svnweb.freebsd.org/changeset/base/298320 > > Log: > Use nitems() from sys/param.h. > > MFC after: 2 weeks. > > Modified: > head/sbin/sunlabel/sunlabel.c > > Modified: head/sbin/sunlabel/sunlabel.c > ============================================================================== > --- head/sbin/sunlabel/sunlabel.c Wed Apr 20 01:03:06 2016 (r298319) > +++ head/sbin/sunlabel/sunlabel.c Wed Apr 20 01:05:54 2016 (r298320) > @@ -903,7 +903,7 @@ tagname(unsigned int tag) > struct tags *tp; > > for (i = 0, tp = knowntags; > - i < sizeof(knowntags) / sizeof(struct tags); > + i < nitems(knowntags); > i++, tp++) > if (tp->id == tag) > return (tp->name); Please re-indent lines like this, the complete "for" fits in one line. (same for the others) Pedro. > @@ -921,7 +921,7 @@ flagname(unsigned int flag) > struct tags *tp; > > for (i = 0, tp = knownflags; > - i < sizeof(knownflags) / sizeof(struct tags); > + i < nitems(knownflags); > i++, tp++) > if (tp->id == flag) > return (tp->name); > @@ -940,7 +940,7 @@ parse_tag(struct sun_disklabel *sl, int > unsigned long l; > > for (i = 0, tp = knowntags; > - i < sizeof(knowntags) / sizeof(struct tags); > + i < nitems(knowntags); > i++, tp++) > if (strcmp(tp->name, tag) == 0) { > sl->sl_vtoc_map[part].svtoc_tag = (uint16_t)tp->id; > @@ -965,7 +965,7 @@ parse_flag(struct sun_disklabel *sl, int > unsigned long l; > > for (i = 0, tp = knownflags; > - i < sizeof(knownflags) / sizeof(struct tags); > + i < nitems(knownflags); > i++, tp++) > if (strcmp(tp->name, flag) == 0) { > sl->sl_vtoc_map[part].svtoc_flag = (uint16_t)tp->id; >