Author: araujo (ports committer)
Date: Tue Aug 4 07:04:36 2015
New Revision: 286279
URL: https://svnweb.freebsd.org/changeset/base/286279
Log:
Get it closes to style(9).
Staticization usage() and printit().
Fix the usage of err(3).
Reviewed by: bde
Modified:
head/usr.bin/ypcat/ypcat.c
Modified: head/usr.bin/ypcat/ypcat.c
==============================================================================
--- head/usr.bin/ypcat/ypcat.c Tue Aug 4 06:02:03 2015 (r286278)
+++ head/usr.bin/ypcat/ypcat.c Tue Aug 4 07:04:36 2015 (r286279)
@@ -33,21 +33,19 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+
#include <ctype.h>
#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include <rpc/rpc.h>
#include <rpc/xdr.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
-void usage(void);
-int printit(u_long, char *, int, char *, int, void *);
-
static const struct ypalias {
char *alias, *name;
} ypaliases[] = {
@@ -65,16 +63,16 @@ static const struct ypalias {
static int key;
-void
+static void
usage(void)
{
- fprintf(stderr,
- "usage: ypcat [-kt] [-d domainname] mapname\n"
- " ypcat -x\n");
+ fprintf(stderr, "%s\n%s\n",
+ "usage: ypcat [-kt] [-d domainname] mapname",
+ " ypcat -x");
exit(1);
}
-int
+static int
printit(u_long instatus, char *inkey, int inkeylen, char *inval, int invallen,
void *indata)
{
@@ -91,9 +89,7 @@ main(int argc, char *argv[])
{
char *domain = NULL, *inmap;
struct ypall_callback ypcb;
- extern char *optarg;
- extern int optind;
- int notrans, c, r;
+ int c, notrans, r;
u_int i;
notrans = key = 0;
@@ -120,7 +116,7 @@ main(int argc, char *argv[])
if (optind + 1 != argc)
usage();
- if (!domain)
+ if (domain == NULL)
yp_get_default_domain(&domain);
inmap = argv[optind];
@@ -137,12 +133,10 @@ main(int argc, char *argv[])
case 0:
break;
case YPERR_YPBIND:
- errx(1, "ypcat: not running ypbind\n");
- exit(1);
+ errx(1, "not running ypbind");
default:
- errx(1, "No such map %s. Reason: %s\n",
+ errx(1, "no such map %s. Reason: %s",
inmap, yperr_string(r));
- exit(1);
}
exit(0);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
