From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:16:00 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA89E106625B; Sun, 6 Nov 2011 08:16:00 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2E3998FC15; Sun, 6 Nov 2011 08:16:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68G0gE008626; Sun, 6 Nov 2011 08:16:00 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68G0lE008624; Sun, 6 Nov 2011 08:16:00 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060816.pA68G0lE008624@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:16:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227171 - head/usr.bin/look X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:16:00 -0000 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;