Module Name: src
Committed By: joerg
Date: Mon Aug 29 14:44:22 UTC 2011
Modified Files:
src/bin/ls: extern.h ls.c util.c
Log Message:
Move usage and mark it static+dead
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/bin/ls/extern.h
cvs rdiff -u -r1.68 -r1.69 src/bin/ls/ls.c
cvs rdiff -u -r1.33 -r1.34 src/bin/ls/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ls/extern.h
diff -u src/bin/ls/extern.h:1.16 src/bin/ls/extern.h:1.17
--- src/bin/ls/extern.h:1.16 Thu Dec 14 20:09:36 2006
+++ src/bin/ls/extern.h Mon Aug 29 14:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.16 2006/12/14 20:09:36 he Exp $ */
+/* $NetBSD: extern.h,v 1.17 2011/08/29 14:44:21 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -51,4 +51,3 @@
void printscol(DISPLAY *);
void printstream(DISPLAY *);
int safe_print(const char *);
-void usage(void);
Index: src/bin/ls/ls.c
diff -u src/bin/ls/ls.c:1.68 src/bin/ls/ls.c:1.69
--- src/bin/ls/ls.c:1.68 Tue Mar 15 03:52:37 2011
+++ src/bin/ls/ls.c Mon Aug 29 14:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ls.c,v 1.68 2011/03/15 03:52:37 erh Exp $ */
+/* $NetBSD: ls.c,v 1.69 2011/08/29 14:44:21 joerg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94";
#else
-__RCSID("$NetBSD: ls.c,v 1.68 2011/03/15 03:52:37 erh Exp $");
+__RCSID("$NetBSD: ls.c,v 1.69 2011/08/29 14:44:21 joerg Exp $");
#endif
#endif /* not lint */
@@ -112,6 +112,17 @@
int f_typedir; /* add type character for directories */
int f_whiteout; /* show whiteout entries */
+__dead static void
+usage(void)
+{
+
+ (void)fprintf(stderr,
+ "usage: %s [-AaBbCcdFfghikLlMmnopqRrSsTtuWwx1] [file ...]\n",
+ getprogname());
+ exit(EXIT_FAILURE);
+ /* NOTREACHED */
+}
+
int
ls_main(int argc, char *argv[])
{
Index: src/bin/ls/util.c
diff -u src/bin/ls/util.c:1.33 src/bin/ls/util.c:1.34
--- src/bin/ls/util.c:1.33 Tue Mar 15 08:36:16 2011
+++ src/bin/ls/util.c Mon Aug 29 14:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.33 2011/03/15 08:36:16 wiz Exp $ */
+/* $NetBSD: util.c,v 1.34 2011/08/29 14:44:21 joerg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)util.c 8.5 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: util.c,v 1.33 2011/03/15 08:36:16 wiz Exp $");
+__RCSID("$NetBSD: util.c,v 1.34 2011/08/29 14:44:21 joerg Exp $");
#endif
#endif /* not lint */
@@ -166,14 +166,3 @@
}
return n;
}
-
-void
-usage(void)
-{
-
- (void)fprintf(stderr,
- "usage: %s [-AaBbCcdFfghikLlMmnopqRrSsTtuWwx1] [file ...]\n",
- getprogname());
- exit(EXIT_FAILURE);
- /* NOTREACHED */
-}
