Date: Wed, 20 Apr 2016 01:05:54 +0000 (UTC) From: Marcelo Araujo <araujo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298320 - head/sbin/sunlabel Message-ID: <201604200105.u3K15sCP021936@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604200105.u3K15sCP021936>