From owner-svn-src-head@freebsd.org  Tue Aug 11 01:02:18 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 DC712998BA7;
 Tue, 11 Aug 2015 01:02:18 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B2623FFA;
 Tue, 11 Aug 2015 01:02:18 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7B12ICe038998;
 Tue, 11 Aug 2015 01:02:18 GMT (envelope-from araujo@FreeBSD.org)
Received: (from araujo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7B12InB038997;
 Tue, 11 Aug 2015 01:02:18 GMT (envelope-from araujo@FreeBSD.org)
Message-Id: <201508110102.t7B12InB038997@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: araujo set sender to
 araujo@FreeBSD.org using -f
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Tue, 11 Aug 2015 01:02:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286609 - head/usr.bin/ypmatch
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Aug 2015 01:02:19 -0000

Author: araujo
Date: Tue Aug 11 01:02:17 2015
New Revision: 286609
URL: https://svnweb.freebsd.org/changeset/base/286609

Log:
  More style(9) fixes. No functional changes.
  
  Differential Revision:	D3350
  Reviewed by:		ed
  Approved by:		bapt (mentor)

Modified:
  head/usr.bin/ypmatch/ypmatch.c

Modified: head/usr.bin/ypmatch/ypmatch.c
==============================================================================
--- head/usr.bin/ypmatch/ypmatch.c	Mon Aug 10 22:30:13 2015	(r286608)
+++ head/usr.bin/ypmatch/ypmatch.c	Tue Aug 11 01:02:17 2015	(r286609)
@@ -68,12 +68,6 @@ usage(void)
 	fprintf(stderr, "%s\n%s\n",
 	    "usage: ypmatch [-kt] [-d domainname] key ... mapname",
 	    "       ypmatch -x");
-	fprintf(stderr,
-	    "where\n"
-	    "\tmapname may be either a mapname or a nickname for a map.\n"
-	    "\t-k prints keys as well as values.\n"
-	    "\t-t inhibits map nickname translation.\n"
-	    "\t-x dumps the map nickname translation table.\n");
 	exit(1);
 }
 
@@ -87,10 +81,10 @@ main(int argc, char *argv[])
 
 	domainname = NULL;
 	notrans = key = 0;
-	while ((c=getopt(argc, argv, "xd:kt")) != -1)
+	while ((c = getopt(argc, argv, "xd:kt")) != -1)
 		switch (c) {
 		case 'x':
-			for (i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
+			for (i = 0; i < nitems(ypaliases); i++)
 				printf("Use \"%s\" for \"%s\"\n",
 					ypaliases[i].alias,
 					ypaliases[i].name);
@@ -108,22 +102,21 @@ main(int argc, char *argv[])
 			usage();
 		}
 
-	if ((argc-optind) < 2 )
+	if (argc - optind < 2)
 		usage();
 
-	if (domainname == NULL) {
+	if (domainname == NULL)
 		yp_get_default_domain(&domainname);
-	}
 
 	inmap = argv[argc-1];
 	if (notrans == 0) {
-		for (i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
+		for (i = 0; i < nitems(ypaliases); i++)
 			if (strcmp(inmap, ypaliases[i].alias) == 0)
 				inmap = ypaliases[i].name;
 	}
 
 	rval = 0;
-	for (; optind < argc-1; optind++) {
+	for (; optind < argc - 1; optind++) {
 		inkey = argv[optind];
 
 		r = yp_match(domainname, inmap, inkey,
@@ -137,7 +130,7 @@ main(int argc, char *argv[])
 		case YPERR_YPBIND:
 			errx(1, "not running ypbind");
 		default:
-			errx(1, "can't match key %s in map %s. Reason: %s",
+			errx(1, "can't match key %s in map %s. reason: %s",
 			    inkey, inmap, yperr_string(r));
 			rval = 1;
 			break;