[Midnightbsd-cvs] src [10700] trunk/usr.bin/xstr/xstr.c: sync up

[laffer1 at midnightbsd.org]

Revision: 10700
          http://svnweb.midnightbsd.org/src/?rev=10700
Author:   laffer1
Date:     2018-06-09 16:14:33 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync up

Modified Paths:
--------------
    trunk/usr.bin/xstr/xstr.c

Modified: trunk/usr.bin/xstr/xstr.c
===================================================================
--- trunk/usr.bin/xstr/xstr.c	2018-06-09 20:13:56 UTC (rev 10699)
+++ trunk/usr.bin/xstr/xstr.c	2018-06-09 20:14:33 UTC (rev 10700)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -29,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/xstr/xstr.c 227247 2011-11-06 18:50:39Z ed $");
 
 #ifndef lint
 static const char copyright[] =
@@ -62,35 +63,35 @@
 
 #define	ignore(a)	((void) a)
 
-off_t	tellpt;
+static off_t	tellpt;
 
-off_t	mesgpt;
-char	cstrings[] =	"strings";
-char	*strings =	cstrings;
+static off_t	mesgpt;
+static char	cstrings[] =	"strings";
+static char	*strings =	cstrings;
 
-int	cflg;
-int	vflg;
-int	readstd;
+static int	cflg;
+static int	vflg;
+static int	readstd;
 
-char lastchr(char *);
+static char lastchr(char *);
 
-int fgetNUL(char *, int, FILE *);
-int istail(char *, char *);
-int octdigit(char);
-int xgetc(FILE *);
+static int fgetNUL(char *, int, FILE *);
+static int istail(char *, char *);
+static int octdigit(char);
+static int xgetc(FILE *);
 
-off_t hashit(char *, int);
-off_t yankstr(char **);
+static off_t hashit(char *, int);
+static off_t yankstr(char **);
 
 static void usage(void);
 
-void flushsh(void);
-void found(int, off_t, char *);
-void inithash(void);
-void onintr(int);
-void process(const char *);
-void prstr(char *);
-void xsdotc(void);
+static void flushsh(void);
+static void found(int, off_t, char *);
+static void inithash(void);
+static void onintr(int);
+static void process(const char *);
+static void prstr(char *);
+static void xsdotc(void);
 
 int
 main(int argc, char *argv[])
@@ -155,9 +156,9 @@
 	exit (1);
 }
 
-char linebuf[BUFSIZ];
+static char linebuf[BUFSIZ];
 
-void
+static void
 process(const char *name)
 {
 	char *cp;
@@ -225,7 +226,7 @@
 		warn("x.c"), onintr(0);
 }
 
-off_t
+static off_t
 yankstr(char **cpp)
 {
 	char *cp = *cpp;
@@ -285,13 +286,13 @@
 	return (hashit(dbuf, 1));
 }
 
-int
+static int
 octdigit(char c)
 {
 	return (isdigit(c) && c != '8' && c != '9');
 }
 
-void
+static void
 inithash(void)
 {
 	char buf[BUFSIZ];
@@ -308,7 +309,7 @@
 	ignore(fclose(mesgread));
 }
 
-int
+static int
 fgetNUL(char *obuf, int rmdr, FILE *file)
 {
 	int c;
@@ -320,7 +321,7 @@
 	return ((feof(file) || ferror(file)) ? 0 : 1);
 }
 
-int
+static int
 xgetc(FILE *file)
 {
 
@@ -330,7 +331,7 @@
 
 #define	BUCKETS	128
 
-struct	hash {
+static struct hash {
 	off_t	hpt;
 	char	*hstr;
 	struct	hash *hnext;
@@ -337,7 +338,7 @@
 	short	hnew;
 } bucket[BUCKETS];
 
-off_t
+static off_t
 hashit(char *str, int new)
 {
 	int i;
@@ -362,7 +363,7 @@
 	return (hp->hpt);
 }
 
-void
+static void
 flushsh(void)
 {
 	int i;
@@ -395,7 +396,7 @@
 		err(4, "%s", strings);
 }
 
-void
+static void
 found(int new, off_t off, char *str)
 {
 	if (vflg == 0)
@@ -408,7 +409,7 @@
 	fprintf(stderr, "\n");
 }
 
-void
+static void
 prstr(char *cp)
 {
 	int c;
@@ -424,7 +425,7 @@
 			fprintf(stderr, "%c", c);
 }
 
-void
+static void
 xsdotc(void)
 {
 	FILE *strf = fopen(strings, "r");
@@ -459,7 +460,7 @@
 	ignore(fclose(strf));
 }
 
-char
+static char
 lastchr(char *cp)
 {
 
@@ -468,7 +469,7 @@
 	return (*cp);
 }
 
-int
+static int
 istail(char *str, char *of)
 {
 	int d = strlen(of) - strlen(str);
@@ -478,7 +479,7 @@
 	return (d);
 }
 
-void
+static void
 onintr(int dummy __unused)
 {