From owner-svn-src-head@FreeBSD.ORG Sun Nov 6 08:14:35 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57AA71065759; Sun, 6 Nov 2011 08:14:34 +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 578388FC19; Sun, 6 Nov 2011 08:14:34 +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 pA68EYNB008127; Sun, 6 Nov 2011 08:14:34 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68EYS9008125; Sun, 6 Nov 2011 08:14:34 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68EYS9008125@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:34 +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: r227159 - head/usr.bin/column X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:35 -0000 Author: ed Date: Sun Nov 6 08:14:34 2011 New Revision: 227159 URL: http://svn.freebsd.org/changeset/base/227159 Log: Add missing static keywords to column(1) Modified: head/usr.bin/column/column.c Modified: head/usr.bin/column/column.c ============================================================================== --- head/usr.bin/column/column.c Sun Nov 6 08:14:28 2011 (r227158) +++ head/usr.bin/column/column.c Sun Nov 6 08:14:34 2011 (r227159) @@ -58,21 +58,21 @@ __FBSDID("$FreeBSD$"); #define TAB 8 -void c_columnate(void); -void input(FILE *); -void maketbl(void); -void print(void); -void r_columnate(void); -void usage(void); -int width(const wchar_t *); - -int termwidth = 80; /* default terminal width */ - -int entries; /* number of records */ -int eval; /* exit value */ -int maxlength; /* longest record */ -wchar_t **list; /* array of pointers to records */ -const wchar_t *separator = L"\t "; /* field separator for table option */ +static void c_columnate(void); +static void input(FILE *); +static void maketbl(void); +static void print(void); +static void r_columnate(void); +static void usage(void); +static int width(const wchar_t *); + +static int termwidth = 80; /* default terminal width */ + +static int entries; /* number of records */ +static int eval; /* exit value */ +static int maxlength; /* longest record */ +static wchar_t **list; /* array of pointers to records */ +static const wchar_t *separator = L"\t "; /* field separator for table option */ int main(int argc, char **argv) @@ -149,7 +149,7 @@ main(int argc, char **argv) exit(eval); } -void +static void c_columnate(void) { int chcnt, col, cnt, endcol, numcols; @@ -178,7 +178,7 @@ c_columnate(void) putwchar('\n'); } -void +static void r_columnate(void) { int base, chcnt, cnt, col, endcol, numcols, numrows, row; @@ -205,7 +205,7 @@ r_columnate(void) } } -void +static void print(void) { int cnt; @@ -221,7 +221,7 @@ typedef struct _tbl { } TBL; #define DEFCOLS 25 -void +static void maketbl(void) { TBL *t; @@ -274,7 +274,7 @@ maketbl(void) #define DEFNUM 1000 #define MAXLINELEN (LINE_MAX + 1) -void +static void input(FILE *fp) { static int maxentry; @@ -313,7 +313,7 @@ input(FILE *fp) } /* Like wcswidth(), but ignores non-printing characters. */ -int +static int width(const wchar_t *wcs) { int w, cw; @@ -324,7 +324,7 @@ width(const wchar_t *wcs) return (w); } -void +static void usage(void) {