Module Name: src
Committed By: joerg
Date: Tue Sep 6 18:24:43 UTC 2011
Modified Files:
src/usr.bin/paste: paste.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/paste/paste.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/paste/paste.c
diff -u src/usr.bin/paste/paste.c:1.15 src/usr.bin/paste/paste.c:1.16
--- src/usr.bin/paste/paste.c:1.15 Tue Apr 7 01:52:26 2009
+++ src/usr.bin/paste/paste.c Tue Sep 6 18:24:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: paste.c,v 1.15 2009/04/07 01:52:26 dholland Exp $ */
+/* $NetBSD: paste.c,v 1.16 2011/09/06 18:24:43 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -40,7 +40,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)paste.c 8.1 (Berkeley) 6/6/93";*/
-__RCSID("$NetBSD: paste.c,v 1.15 2009/04/07 01:52:26 dholland Exp $");
+__RCSID("$NetBSD: paste.c,v 1.16 2011/09/06 18:24:43 joerg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -52,14 +52,14 @@
#include <string.h>
#include <unistd.h>
-void parallel(int, char **);
-void sequential(char **);
-int tr(char *);
-void usage(void);
-
-char dflt_delim[] = "\t";
-char *delim = dflt_delim;
-int delimcnt = 1;
+static void parallel(int, char **);
+static void sequential(char **);
+static int tr(char *);
+__dead static void usage(void);
+
+static char dflt_delim[] = "\t";
+static char *delim = dflt_delim;
+static int delimcnt = 1;
int
main(int argc, char **argv)
@@ -91,7 +91,7 @@
exit(0);
}
-void
+static void
parallel(int argc, char **argv)
{
char ch, *dp, *line;
@@ -157,7 +157,7 @@
free(fpp);
}
-void
+static void
sequential(char **argv)
{
FILE *fp;
@@ -195,7 +195,7 @@
}
}
-int
+static int
tr(char *arg)
{
int cnt;
@@ -225,8 +225,8 @@
return(cnt);
}
-void
-usage()
+static void
+usage(void)
{
(void)fprintf(stderr, "paste: [-s] [-d delimiters] file ...\n");
exit(1);
