Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/ls Move usage and mark it static+dead



details:   https://anonhg.NetBSD.org/src/rev/b9bf9bbb9c73
branches:  trunk
changeset: 768963:b9bf9bbb9c73
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Aug 29 14:44:21 2011 +0000

description:
Move usage and mark it static+dead

diffstat:

 bin/ls/extern.h |   3 +--
 bin/ls/ls.c     |  15 +++++++++++++--
 bin/ls/util.c   |  15 ++-------------
 3 files changed, 16 insertions(+), 17 deletions(-)

diffs (83 lines):

diff -r 99302fa92612 -r b9bf9bbb9c73 bin/ls/extern.h
--- a/bin/ls/extern.h   Mon Aug 29 14:38:30 2011 +0000
+++ b/bin/ls/extern.h   Mon Aug 29 14:44:21 2011 +0000
@@ -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);
diff -r 99302fa92612 -r b9bf9bbb9c73 bin/ls/ls.c
--- a/bin/ls/ls.c       Mon Aug 29 14:38:30 2011 +0000
+++ b/bin/ls/ls.c       Mon Aug 29 14:44:21 2011 +0000
@@ -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[])
 {
diff -r 99302fa92612 -r b9bf9bbb9c73 bin/ls/util.c
--- a/bin/ls/util.c     Mon Aug 29 14:38:30 2011 +0000
+++ b/bin/ls/util.c     Mon Aug 29 14:44:21 2011 +0000
@@ -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 */
-}



Home | Main Index | Thread Index | Old Index