Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 6 Nov 2011 08:16:00 +0000 (UTC)
From:      Ed Schouten <ed@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r227171 - head/usr.bin/look
Message-ID:  <201111060816.pA68G0lE008624@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ed
Date: Sun Nov  6 08:15:59 2011
New Revision: 227171
URL: http://svn.freebsd.org/changeset/base/227171

Log:
  Add missing static keywords to look(1)

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

Modified: head/usr.bin/look/look.c
==============================================================================
--- head/usr.bin/look/look.c	Sun Nov  6 08:15:53 2011	(r227170)
+++ head/usr.bin/look/look.c	Sun Nov  6 08:15:59 2011	(r227171)
@@ -77,14 +77,14 @@ static char _path_words[] = _PATH_WORDS;
 #define	GREATER		1
 #define	LESS		(-1)
 
-int dflag, fflag;
+static int dflag, fflag;
 
-char    *binary_search(wchar_t *, unsigned char *, unsigned char *);
-int      compare(wchar_t *, unsigned char *, unsigned char *);
-char    *linear_search(wchar_t *, unsigned char *, unsigned char *);
-int      look(wchar_t *, unsigned char *, unsigned char *);
-wchar_t	*prepkey(const char *, wchar_t);
-void     print_from(wchar_t *, unsigned char *, unsigned char *);
+static char	*binary_search(wchar_t *, unsigned char *, unsigned char *);
+static int	 compare(wchar_t *, unsigned char *, unsigned char *);
+static char	*linear_search(wchar_t *, unsigned char *, unsigned char *);
+static int	 look(wchar_t *, unsigned char *, unsigned char *);
+static wchar_t	*prepkey(const char *, wchar_t);
+static void	 print_from(wchar_t *, unsigned char *, unsigned char *);
 
 static void usage(void);
 
@@ -151,7 +151,7 @@ main(int argc, char *argv[])
 	exit(match);
 }
 
-wchar_t *
+static wchar_t *
 prepkey(const char *string, wchar_t termchar)
 {
 	const char *readp;
@@ -182,7 +182,7 @@ prepkey(const char *string, wchar_t term
 	return (key);
 }
 
-int
+static int
 look(wchar_t *string, unsigned char *front, unsigned char *back)
 {
 
@@ -236,7 +236,7 @@ look(wchar_t *string, unsigned char *fro
 #define	SKIP_PAST_NEWLINE(p, back) \
 	while (p < back && *p++ != '\n');
 
-char *
+static char *
 binary_search(wchar_t *string, unsigned char *front, unsigned char *back)
 {
 	unsigned char *p;
@@ -270,7 +270,7 @@ binary_search(wchar_t *string, unsigned 
  * 	o front points at the first character in a line.
  *	o front is before or at the first line to be printed.
  */
-char *
+static char *
 linear_search(wchar_t *string, unsigned char *front, unsigned char *back)
 {
 	while (front < back) {
@@ -290,7 +290,7 @@ linear_search(wchar_t *string, unsigned 
 /*
  * Print as many lines as match string, starting at front.
  */
-void
+static void
 print_from(wchar_t *string, unsigned char *front, unsigned char *back)
 {
 	for (; front < back && compare(string, front, back) == EQUAL; ++front) {
@@ -315,7 +315,7 @@ print_from(wchar_t *string, unsigned cha
  * The string "s1" is null terminated.  The string s2 is '\n' terminated (or
  * "back" terminated).
  */
-int
+static int
 compare(wchar_t *s1, unsigned char *s2, unsigned char *back)
 {
 	wchar_t ch1, ch2;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111060816.pA68G0lE008624>