[src/trunk]: src/usr.bin/sort put contents of extern.h directly to sort.h, an...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d28f3b246dc
branches:  trunk
changeset: 540795:9d28f3b246dc
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Dec 24 15:02:46 2002 +0000

description:
put contents of extern.h directly to sort.h, and g/c extern.h
de-__P()

diffstat:

 usr.bin/sort/extern.h |  69 ---------------------------------------------------
 usr.bin/sort/sort.h   |  38 ++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 74 deletions(-)

diffs (129 lines):

diff -r 013e3731af19 -r 9d28f3b246dc usr.bin/sort/extern.h
--- a/usr.bin/sort/extern.h     Tue Dec 24 14:58:57 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*     $NetBSD: extern.h,v 1.6 2001/02/19 20:50:17 jdolecek Exp $      */
-
-/*-
- * Copyright (c) 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Peter McIlroy.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *     @(#)extern.h    8.1 (Berkeley) 6/6/93
- */
-
-void    append  __P((const u_char **, int, int, FILE *,
-           void (*)(const RECHEADER *, FILE *), struct field *));
-void    concat __P((FILE *, FILE *));
-length_t enterkey __P((RECHEADER *, DBT *, int, struct field *));
-void    fixit __P((int *, char **));
-void    fldreset __P((struct field *));
-FILE   *ftmp __P((void));
-void    fmerge __P((int, int, struct filelist *, int,
-               get_func_t, FILE *, put_func_t, struct field *));
-void    fsort __P((int, int, int, struct filelist *, int, FILE *,
-               struct field *));
-int     geteasy __P((int, int, struct filelist *,
-           int, RECHEADER *, u_char *, struct field *));
-int     getnext __P((int, int, struct filelist *,
-           int, RECHEADER *, u_char *, struct field *));
-int     makekey __P((int, int, struct filelist *,
-           int, RECHEADER *, u_char *, struct field *));
-int     makeline __P((int, int, struct filelist *,
-           int, RECHEADER *, u_char *, struct field *));
-void    merge __P((int, int, get_func_t, FILE *, put_func_t, struct field *));
-void    num_init __P((void));
-void    onepass __P((const u_char **, int, long, long *, u_char *, FILE *));
-int     optval __P((int, int));
-void    order __P((struct filelist *, get_func_t, struct field *));
-void    putline __P((const RECHEADER *, FILE *));
-void    putrec __P((const RECHEADER *, FILE *));
-void    rd_append __P((int, int, int, FILE *, u_char *, u_char *));
-int     setfield __P((const char *, struct field *, int));
-void    settables __P((int));
diff -r 013e3731af19 -r 9d28f3b246dc usr.bin/sort/sort.h
--- a/usr.bin/sort/sort.h       Tue Dec 24 14:58:57 2002 +0000
+++ b/usr.bin/sort/sort.h       Tue Dec 24 15:02:46 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sort.h,v 1.13 2002/12/24 13:20:25 jdolecek Exp $       */
+/*     $NetBSD: sort.h,v 1.14 2002/12/24 15:02:46 jdolecek Exp $       */
 
 /*-
  * Copyright (c) 1993
@@ -132,9 +132,9 @@
        const char * const * names;
 };
 
-typedef int (*get_func_t) __P((int, int, struct filelist *, int,
-               RECHEADER *, u_char *, struct field *));
-typedef void (*put_func_t) __P((const struct recheader *, FILE *));
+typedef int (*get_func_t)(int, int, struct filelist *, int,
+               RECHEADER *, u_char *, struct field *);
+typedef void (*put_func_t)(const struct recheader *, FILE *);
 
 extern int PANIC;      /* maximum depth of fsort before fmerge is called */
 extern u_char ascii[NBINS], Rascii[NBINS], Ftable[NBINS], RFtable[NBINS];
@@ -147,4 +147,32 @@
 extern struct coldesc clist[(ND+1)*2];
 extern int ncols;
 
-#include "extern.h"
+void    append(const u_char **, int, int, FILE *,
+           void (*)(const RECHEADER *, FILE *), struct field *);
+void    concat(FILE *, FILE *);
+length_t enterkey(RECHEADER *, DBT *, int, struct field *);
+void    fixit(int *, char **);
+void    fldreset(struct field *);
+FILE   *ftmp(void);
+void    fmerge(int, int, struct filelist *, int,
+               get_func_t, FILE *, put_func_t, struct field *);
+void    fsort(int, int, int, struct filelist *, int, FILE *,
+               struct field *);
+int     geteasy(int, int, struct filelist *,
+           int, RECHEADER *, u_char *, struct field *);
+int     getnext(int, int, struct filelist *,
+           int, RECHEADER *, u_char *, struct field *);
+int     makekey(int, int, struct filelist *,
+           int, RECHEADER *, u_char *, struct field *);
+int     makeline(int, int, struct filelist *,
+           int, RECHEADER *, u_char *, struct field *);
+void    merge(int, int, get_func_t, FILE *, put_func_t, struct field *);
+void    num_init(void);
+void    onepass(const u_char **, int, long, long *, u_char *, FILE *);
+int     optval(int, int);
+void    order(struct filelist *, get_func_t, struct field *);
+void    putline(const RECHEADER *, FILE *);
+void    putrec(const RECHEADER *, FILE *);
+void    rd_append(int, int, int, FILE *, u_char *, u_char *);
+int     setfield(const char *, struct field *, int);
+void    settables(int);