Module Name: src
Committed By: joerg
Date: Tue Aug 30 21:33:28 UTC 2011
Modified Files:
src/usr.bin/col: col.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/col/col.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/col/col.c
diff -u src/usr.bin/col/col.c:1.15 src/usr.bin/col/col.c:1.16
--- src/usr.bin/col/col.c:1.15 Mon Jul 21 14:19:21 2008
+++ src/usr.bin/col/col.c Tue Aug 30 21:33:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: col.c,v 1.15 2008/07/21 14:19:21 lukem Exp $ */
+/* $NetBSD: col.c,v 1.16 2011/08/30 21:33:28 joerg Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: col.c,v 1.15 2008/07/21 14:19:21 lukem Exp $");
+__RCSID("$NetBSD: col.c,v 1.16 2011/08/30 21:33:28 joerg Exp $");
#endif /* not lint */
#include <ctype.h>
@@ -89,24 +89,24 @@
int l_max_col; /* max column in the line */
};
-LINE *alloc_line(void);
-void dowarn(int);
-void flush_line(LINE *);
-void flush_lines(int);
-void flush_blanks(void);
-void free_line(LINE *);
-void usage(void);
-void wrerr(void);
-void *xmalloc(void *, size_t);
-
-CSET last_set; /* char_set of last char printed */
-LINE *lines;
-int compress_spaces; /* if doing space -> tab conversion */
-int fine; /* if `fine' resolution (half lines) */
-int max_bufd_lines; /* max # lines to keep in memory */
-int nblank_lines; /* # blanks after last flushed line */
-int no_backspaces; /* if not to output any backspaces */
-int pass_unknown_seqs; /* whether to pass unknown control sequences */
+static LINE *alloc_line(void);
+static void dowarn(int);
+static void flush_line(LINE *);
+static void flush_lines(int);
+static void flush_blanks(void);
+static void free_line(LINE *);
+__dead static void usage(void);
+__dead static void wrerr(void);
+static void *xmalloc(void *, size_t);
+
+static CSET last_set; /* char_set of last char printed */
+static LINE *lines;
+static int compress_spaces; /* if doing space -> tab conversion */
+static int fine; /* if `fine' resolution (half lines) */
+static int max_bufd_lines; /* max # lines to keep in memory */
+static int nblank_lines; /* # blanks after last flushed line */
+static int no_backspaces; /* if not to output any backspaces */
+static int pass_unknown_seqs; /* whether to pass unknown control sequences */
#define PUTC(ch) \
if (putchar(ch) == EOF) \
@@ -324,7 +324,7 @@
/* NOTREACHED */
}
-void
+static void
flush_lines(int nflush)
{
LINE *l;
@@ -350,7 +350,7 @@
* is the number of half line feeds, otherwise it is the number of whole line
* feeds.
*/
-void
+static void
flush_blanks(void)
{
int half, i, nb;
@@ -379,7 +379,7 @@
* Write a line to stdout taking care of space to tab conversion (-h flag)
* and character set shifts.
*/
-void
+static void
flush_line(LINE *l)
{
CHAR *c, *endc;
@@ -478,7 +478,7 @@
static LINE *line_freelist;
-LINE *
+static LINE *
alloc_line(void)
{
LINE *l;
@@ -498,7 +498,7 @@
return (l);
}
-void
+static void
free_line(LINE *l)
{
@@ -506,7 +506,7 @@
line_freelist = l;
}
-void *
+static void *
xmalloc(void *p, size_t size)
{
void *q;
@@ -517,7 +517,7 @@
return (p);
}
-void
+static void
usage(void)
{
@@ -525,7 +525,7 @@
exit(EXIT_FAILURE);
}
-void
+static void
wrerr(void)
{
@@ -533,7 +533,7 @@
exit(EXIT_FAILURE);
}
-void
+static void
dowarn(int line)
{
