Source-Changes-HG archive

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

[src/trunk]: src/usr.bin fix nested extern



details:   https://anonhg.NetBSD.org/src/rev/e9757e0485ec
branches:  trunk
changeset: 503368:e9757e0485ec
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Feb 05 01:21:00 2001 +0000

description:
fix nested extern

diffstat:

 usr.bin/apropos/apropos.c     |  9 ++++-----
 usr.bin/audio/ctl/ctl.c       |  5 +++--
 usr.bin/audio/play/play.c     |  6 +++---
 usr.bin/audio/record/record.c |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diffs (117 lines):

diff -r c232b2ef23f5 -r e9757e0485ec usr.bin/apropos/apropos.c
--- a/usr.bin/apropos/apropos.c Mon Feb 05 01:20:12 2001 +0000
+++ b/usr.bin/apropos/apropos.c Mon Feb 05 01:21:00 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apropos.c,v 1.14 1998/11/06 22:29:44 christos Exp $    */
+/*     $NetBSD: apropos.c,v 1.15 2001/02/05 01:21:00 christos Exp $    */
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)apropos.c  8.8 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: apropos.c,v 1.14 1998/11/06 22:29:44 christos Exp $");
+__RCSID("$NetBSD: apropos.c,v 1.15 2001/02/05 01:21:00 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -73,6 +73,8 @@
 int match __P((char *, char *));
 void usage __P((void));
 
+extern char *__progname;
+
 int
 main(argc, argv)
        int argc;
@@ -239,9 +241,6 @@
 void
 usage()
 {
-
-       extern char *__progname;
-
        (void)fprintf(stderr,
            "Usage: %s [-C file] [-M path] [-m path] keyword ...\n",
            __progname);
diff -r c232b2ef23f5 -r e9757e0485ec usr.bin/audio/ctl/ctl.c
--- a/usr.bin/audio/ctl/ctl.c   Mon Feb 05 01:20:12 2001 +0000
+++ b/usr.bin/audio/ctl/ctl.c   Mon Feb 05 01:21:00 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ctl.c,v 1.24 2000/12/22 11:38:42 mrg Exp $     */
+/*     $NetBSD: ctl.c,v 1.25 2001/02/05 01:22:22 christos Exp $        */
 
 /*
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -155,6 +155,8 @@
        { 0 }
 };
 
+extern char *__progname;
+
 struct field *
 findfield(name)
        char *name;
@@ -347,7 +349,6 @@
        struct stat dstat, ostat;
        const char *file;
        char *sep = "=";
-       extern char *__progname;
     
        file = getenv("AUDIOCTLDEVICE");
        if (file == 0)
diff -r c232b2ef23f5 -r e9757e0485ec usr.bin/audio/play/play.c
--- a/usr.bin/audio/play/play.c Mon Feb 05 01:20:12 2001 +0000
+++ b/usr.bin/audio/play/play.c Mon Feb 05 01:21:00 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: play.c,v 1.20 2001/01/19 14:11:56 mrg Exp $    */
+/*     $NetBSD: play.c,v 1.21 2001/02/05 01:23:24 christos Exp $       */
 
 /*
  * Copyright (c) 1999 Matthew R. Green
@@ -68,6 +68,8 @@
 int    audiofd, ctlfd;
 int    exitstatus = EXIT_SUCCESS;
 
+extern char *__progname;
+
 int
 main(argc, argv)
        int argc;
@@ -408,8 +410,6 @@
 void
 usage()
 {
-       extern char *__progname;
-
        fprintf(stderr, "Usage: %s [-hiqV] [options] files\n", __progname);
        fprintf(stderr, "Options:\n\t"
            "-C audio control device\n\t"
diff -r c232b2ef23f5 -r e9757e0485ec usr.bin/audio/record/record.c
--- a/usr.bin/audio/record/record.c     Mon Feb 05 01:20:12 2001 +0000
+++ b/usr.bin/audio/record/record.c     Mon Feb 05 01:21:00 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: record.c,v 1.12 2000/12/22 11:38:43 mrg Exp $  */
+/*     $NetBSD: record.c,v 1.13 2001/02/05 01:24:34 christos Exp $     */
 
 /*
  * Copyright (c) 1999 Matthew R. Green
@@ -77,6 +77,8 @@
 void write_header (void);
 void rewrite_header (void);
 
+extern char *__progname;
+
 int
 main(argc, argv)
        int argc;
@@ -371,8 +373,6 @@
 void
 usage()
 {
-       extern char *__progname;
-
        fprintf(stderr, "Usage: %s [-afhqV] [options] {files ...|-}\n", __progname);
        fprintf(stderr, "Options:\n\t"
            "-C audio control device\n\t"



Home | Main Index | Thread Index | Old Index