From owner-svn-src-head@freebsd.org  Fri Aug  7 02:37:48 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 D4FCF9B51D0;
 Fri,  7 Aug 2015 02:37:48 +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 A1EF07A4;
 Fri,  7 Aug 2015 02:37:48 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t772bm89065073;
 Fri, 7 Aug 2015 02:37:48 GMT (envelope-from araujo@FreeBSD.org)
Received: (from araujo@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t772bmQJ065072;
 Fri, 7 Aug 2015 02:37:48 GMT (envelope-from araujo@FreeBSD.org)
Message-Id: <201508070237.t772bmQJ065072@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: Fri, 7 Aug 2015 02:37:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286394 - 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: Fri, 07 Aug 2015 02:37:48 -0000

Author: araujo (ports committer)
Date: Fri Aug  7 02:37:47 2015
New Revision: 286394
URL: https://svnweb.freebsd.org/changeset/base/286394

Log:
  Get closest as possible with style(9). No functional change.
  
  Differential Revision:	D3295
  Reviewed by:		bapt

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

Modified: head/usr.bin/ypmatch/ypmatch.c
==============================================================================
--- head/usr.bin/ypmatch/ypmatch.c	Fri Aug  7 02:05:16 2015	(r286393)
+++ head/usr.bin/ypmatch/ypmatch.c	Fri Aug  7 02:37:47 2015	(r286394)
@@ -34,20 +34,19 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+
+#include <ctype.h>
+#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <ctype.h>
-#include <err.h>
 
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
 
-void	usage(void);
-
 static const struct ypalias {
 	char *alias, *name;
 } ypaliases[] = {
@@ -63,11 +62,11 @@ static const struct ypalias {
 	{ "ethers", "ethers.byname" },
 };
 
-void
+static void
 usage(void)
 {
-	fprintf(stderr,
-	    "usage: ypmatch [-kt] [-d domain] key ... mapname\n"
+	fprintf(stderr, "%s\n%s\n",
+	    "usage: ypmatch [-kt] [-d domain] key ... mapname",
 	    "       ypmatch -x\n");
 	fprintf(stderr,
 	    "where\n"
@@ -82,8 +81,6 @@ int
 main(int argc, char *argv[])
 {
 	char *domainname, *inkey, *inmap, *outbuf;
-	extern char *optarg;
-	extern int optind;
 	int outbuflen, key, notrans, rval;
 	int c, r;
 	u_int i;
@@ -114,12 +111,12 @@ main(int argc, char *argv[])
 	if ((argc-optind) < 2 )
 		usage();
 
-	if (!domainname) {
+	if (domainname == NULL) {
 		yp_get_default_domain(&domainname);
 	}
 
 	inmap = argv[argc-1];
-	if (!notrans) {
+	if (notrans == 0) {
 		for (i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
 			if (strcmp(inmap, ypaliases[i].alias) == 0)
 				inmap = ypaliases[i].name;
@@ -138,10 +135,9 @@ main(int argc, char *argv[])
 			printf("%*.*s\n", outbuflen, outbuflen, outbuf);
 			break;
 		case YPERR_YPBIND:
-			errx(1, "yp_match: not running ypbind");
-			exit(1);
+			errx(1, "not running ypbind");
 		default:
-			errx(1, "Can't match key %s in map %s. Reason: %s\n",
+			errx(1, "can't match key %s in map %s. Reason: %s",
 			    inkey, inmap, yperr_string(r));
 			rval = 1;
 			break;