summaryrefslogtreecommitdiff
path: root/usr.sbin/config
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/config')
-rw-r--r--usr.sbin/config/cmd.h28
-rw-r--r--usr.sbin/config/config.h76
-rw-r--r--usr.sbin/config/exec.c34
-rw-r--r--usr.sbin/config/exec.h10
-rw-r--r--usr.sbin/config/files.c14
-rw-r--r--usr.sbin/config/gram.y14
-rw-r--r--usr.sbin/config/main.c20
-rw-r--r--usr.sbin/config/misc.h6
-rw-r--r--usr.sbin/config/mkheaders.c10
-rw-r--r--usr.sbin/config/mkioconf.c22
-rw-r--r--usr.sbin/config/mkmakefile.c20
-rw-r--r--usr.sbin/config/mkswap.c6
-rw-r--r--usr.sbin/config/pack.c34
-rw-r--r--usr.sbin/config/scan.l4
-rw-r--r--usr.sbin/config/sem.c24
-rw-r--r--usr.sbin/config/sem.h34
-rw-r--r--usr.sbin/config/ukc.c8
-rw-r--r--usr.sbin/config/ukc.h54
-rw-r--r--usr.sbin/config/util.c6
19 files changed, 212 insertions, 212 deletions
diff --git a/usr.sbin/config/cmd.h b/usr.sbin/config/cmd.h
index 2f2d330e774..dc354b6e94c 100644
--- a/usr.sbin/config/cmd.h
+++ b/usr.sbin/config/cmd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/* $OpenBSD: cmd.h,v 1.4 2002/02/16 21:28:01 millert Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -59,19 +59,19 @@ extern cmd_table_t cmd_table[];
#endif
/* Prototypes */
-int Xhelp __P((cmd_t *));
-int Xadd __P((cmd_t *));
-int Xbase __P((cmd_t *));
-int Xchange __P((cmd_t *));
-int Xdisable __P((cmd_t *));
-int Xenable __P((cmd_t *));
-int Xfind __P((cmd_t *));
-int Xlines __P((cmd_t *));
-int Xlist __P((cmd_t *));
-int Xshow __P((cmd_t *));
-int Xexit __P((cmd_t *));
-int Xquit __P((cmd_t *));
-int Xtimezone __P((cmd_t *));
+int Xhelp(cmd_t *);
+int Xadd(cmd_t *);
+int Xbase(cmd_t *);
+int Xchange(cmd_t *);
+int Xdisable(cmd_t *);
+int Xenable(cmd_t *);
+int Xfind(cmd_t *);
+int Xlines(cmd_t *);
+int Xlist(cmd_t *);
+int Xshow(cmd_t *);
+int Xexit(cmd_t *);
+int Xquit(cmd_t *);
+int Xtimezone(cmd_t *);
#endif /* _CMD_H */
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 426b15447f6..5017fdda174 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.h,v 1.15 2001/12/05 10:11:23 deraadt Exp $ */
+/* $OpenBSD: config.h,v 1.16 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: config.h,v 1.30 1997/02/02 21:12:30 thorpej Exp $ */
/*
@@ -328,65 +328,65 @@ struct { /* loc[] table for config */
} locators;
/* files.c */
-void initfiles __P((void));
-void checkfiles __P((void));
-int fixfiles __P((void)); /* finalize */
-int fixobjects __P((void));
-void addfile __P((const char *, struct nvlist *, int, const char *));
-void addobject __P((const char *, struct nvlist *, int));
+void initfiles(void);
+void checkfiles(void);
+int fixfiles(void); /* finalize */
+int fixobjects(void);
+void addfile(const char *, struct nvlist *, int, const char *);
+void addobject(const char *, struct nvlist *, int);
/* hash.c */
-struct hashtab *ht_new __P((void));
-int ht_insrep __P((struct hashtab *, const char *, void *, int));
-int ht_remove __P((struct hashtab *, const char *));
+struct hashtab *ht_new(void);
+int ht_insrep(struct hashtab *, const char *, void *, int);
+int ht_remove(struct hashtab *, const char *);
#define ht_insert(ht, nam, val) ht_insrep(ht, nam, val, 0)
#define ht_replace(ht, nam, val) ht_insrep(ht, nam, val, 1)
-void *ht_lookup __P((struct hashtab *, const char *));
-void initintern __P((void));
-const char *intern __P((const char *));
+void *ht_lookup(struct hashtab *, const char *);
+void initintern(void);
+const char *intern(const char *);
/* main.c */
-void addoption __P((const char *name, const char *value));
-void removeoption __P((const char *name));
-void addmkoption __P((const char *name, const char *value));
-void defoption __P((const char *name));
-int devbase_has_instances __P((struct devbase *, int));
-int deva_has_instances __P((struct deva *, int));
-void setupdirs __P((void));
+void addoption(const char *name, const char *value);
+void removeoption(const char *name);
+void addmkoption(const char *name, const char *value);
+void defoption(const char *name);
+int devbase_has_instances(struct devbase *, int);
+int deva_has_instances(struct deva *, int);
+void setupdirs(void);
/* mkheaders.c */
-int mkheaders __P((void));
+int mkheaders(void);
/* mkioconf.c */
-int mkioconf __P((void));
+int mkioconf(void);
/* mkmakefile.c */
-int mkmakefile __P((void));
+int mkmakefile(void);
/* mkswap.c */
-int mkswap __P((void));
+int mkswap(void);
/* pack.c */
-void pack __P((void));
+void pack(void);
/* scan.l */
-int currentline __P((void));
-int firstfile __P((const char *));
-int include __P((const char *, int));
+int currentline(void);
+int firstfile(const char *);
+int include(const char *, int);
/* sem.c, other than for yacc actions */
-void initsem __P((void));
+void initsem(void);
/* util.c */
-void *emalloc __P((size_t));
-void *erealloc __P((void *, size_t));
-char *sourcepath __P((const char *));
-void error __P((const char *, ...)); /* immediate errs */
-void xerror __P((const char *, int, const char *, ...)); /* delayed errs */
-__dead void panic __P((const char *, ...));
+void *emalloc(size_t);
+void *erealloc(void *, size_t);
+char *sourcepath(const char *);
+void error(const char *, ...); /* immediate errs */
+void xerror(const char *, int, const char *, ...); /* delayed errs */
+__dead void panic(const char *, ...);
struct nvlist *newnv __P((const char *, const char *, void *, int,
struct nvlist *));
-void nvfree __P((struct nvlist *));
-void nvfreel __P((struct nvlist *));
+void nvfree(struct nvlist *);
+void nvfreel(struct nvlist *);
-int ukc __P((char *, char *, int, int));
+int ukc(char *, char *, int, int);
diff --git a/usr.sbin/config/exec.c b/usr.sbin/config/exec.c
index ece46bc69ab..5549c5d4b81 100644
--- a/usr.sbin/config/exec.c
+++ b/usr.sbin/config/exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.c,v 1.2 2001/12/05 10:11:23 deraadt Exp $ */
+/* $OpenBSD: exec.c,v 1.3 2002/02/16 21:28:01 millert Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -34,31 +34,31 @@
#include <stdio.h>
#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec.c,v 1.2 2001/12/05 10:11:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: exec.c,v 1.3 2002/02/16 21:28:01 millert Exp $";
#endif
#ifdef AOUT_SUPPORT
-int aout_check __P((char *));
-void aout_loadkernel __P((char *));
-void aout_savekernel __P((char *));
-caddr_t aout_adjust __P((caddr_t));
-caddr_t aout_readjust __P((caddr_t));
+int aout_check(char *);
+void aout_loadkernel(char *);
+void aout_savekernel(char *);
+caddr_t aout_adjust(caddr_t);
+caddr_t aout_readjust(caddr_t);
#endif
#ifdef ECOFF_SUPPORT
-int ecoff_check __P((char *));
-void ecoff_loadkernel __P((char *));
-void ecoff_savekernel __P((char *));
-caddr_t ecoff_adjust __P((caddr_t));
-caddr_t ecoff_readjust __P((caddr_t));
+int ecoff_check(char *);
+void ecoff_loadkernel(char *);
+void ecoff_savekernel(char *);
+caddr_t ecoff_adjust(caddr_t);
+caddr_t ecoff_readjust(caddr_t);
#endif
#ifdef ELF_SUPPORT
-int elf_check __P((char *));
-void elf_loadkernel __P((char *));
-void elf_savekernel __P((char *));
-caddr_t elf_adjust __P((caddr_t));
-caddr_t elf_readjust __P((caddr_t));
+int elf_check(char *);
+void elf_loadkernel(char *);
+void elf_savekernel(char *);
+caddr_t elf_adjust(caddr_t);
+caddr_t elf_readjust(caddr_t);
#endif
#define DO_AOUT 0
diff --git a/usr.sbin/config/exec.h b/usr.sbin/config/exec.h
index 93420676721..9ced4ae761c 100644
--- a/usr.sbin/config/exec.h
+++ b/usr.sbin/config/exec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.h,v 1.2 2001/08/12 12:03:03 heko Exp $ */
+/* $OpenBSD: exec.h,v 1.3 2002/02/16 21:28:01 millert Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -32,10 +32,10 @@
#ifndef _EXEC_H
#define _EXEC_H
-void loadkernel __P((char *));
-void savekernel __P((char *));
-caddr_t adjust __P((caddr_t));
-caddr_t readjust __P((caddr_t));
+void loadkernel(char *);
+void savekernel(char *);
+caddr_t adjust(caddr_t);
+caddr_t readjust(caddr_t);
#endif /* _EXEC_H */
diff --git a/usr.sbin/config/files.c b/usr.sbin/config/files.c
index 84eeadcec53..4245d2fe5b9 100644
--- a/usr.sbin/config/files.c
+++ b/usr.sbin/config/files.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: files.c,v 1.8 2001/12/05 10:11:23 deraadt Exp $ */
+/* $OpenBSD: files.c,v 1.9 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: files.c,v 1.6 1996/03/17 13:18:17 cgd Exp $ */
/*
@@ -68,13 +68,13 @@ static struct files **unchecked;
static struct objects **nextobject;
-static int checkaux __P((const char *, void *));
-static int fixcount __P((const char *, void *));
-static int fixfsel __P((const char *, void *));
-static int fixsel __P((const char *, void *));
+static int checkaux(const char *, void *);
+static int fixcount(const char *, void *);
+static int fixfsel(const char *, void *);
+static int fixsel(const char *, void *);
static int expr_eval __P((struct nvlist *,
int (*)(const char *, void *), void *));
-static void expr_free __P((struct nvlist *));
+static void expr_free(struct nvlist *);
void
initfiles()
@@ -392,7 +392,7 @@ fixsel(name, context)
static int
expr_eval(expr, fn, context)
register struct nvlist *expr;
- register int (*fn) __P((const char *, void *));
+ register int (*fn)(const char *, void *);
register void *context;
{
int lhs, rhs;
diff --git a/usr.sbin/config/gram.y b/usr.sbin/config/gram.y
index 1012d32d596..f616ff61936 100644
--- a/usr.sbin/config/gram.y
+++ b/usr.sbin/config/gram.y
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: gram.y,v 1.11 2001/01/23 06:02:58 angelos Exp $ */
+/* $OpenBSD: gram.y,v 1.12 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: gram.y,v 1.14 1997/02/02 21:12:32 thorpej Exp $ */
/*
@@ -60,9 +60,9 @@
#define stop(s) error(s), exit(1)
-int include __P((const char *, int));
-void yyerror __P((const char *));
-int yylex __P((void));
+int include(const char *, int);
+void yyerror(const char *);
+int yylex(void);
static struct config conf; /* at most one active at a time */
@@ -85,9 +85,9 @@ static int adepth;
#define fx_and(e1, e2) new0(NULL, NULL, e1, FX_AND, e2)
#define fx_or(e1, e2) new0(NULL, NULL, e1, FX_OR, e2)
-static void cleanup __P((void));
-static void setmachine __P((const char *, const char *));
-static void check_maxpart __P((void));
+static void cleanup(void);
+static void setmachine(const char *, const char *);
+static void check_maxpart(void);
%}
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 947d8d1bb64..03a0e2acc22 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.22 2001/12/11 23:47:00 miod Exp $ */
+/* $OpenBSD: main.c,v 1.23 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: main.c,v 1.22 1997/02/02 21:12:33 thorpej Exp $ */
/*
@@ -62,8 +62,8 @@ static char copyright[] =
#include <unistd.h>
#include "config.h"
-int firstfile __P((const char *));
-int yyparse __P((void));
+int firstfile(const char *);
+int yyparse(void);
extern char *optarg;
extern int optind;
@@ -73,15 +73,15 @@ static struct nvlist **nextopt;
static struct nvlist **nextdefopt;
static struct nvlist **nextmkopt;
-static __dead void stop __P((void));
+static __dead void stop(void);
static int do_option __P((struct hashtab *, struct nvlist ***,
const char *, const char *, const char *));
-static int crosscheck __P((void));
-static int badstar __P((void));
-static int mksymlinks __P((void));
-static int hasparent __P((struct devi *));
-static int cfcrosscheck __P((struct config *, const char *, struct nvlist *));
-static void optiondelta __P((void));
+static int crosscheck(void);
+static int badstar(void);
+static int mksymlinks(void);
+static int hasparent(struct devi *);
+static int cfcrosscheck(struct config *, const char *, struct nvlist *);
+static void optiondelta(void);
int madedir = 0;
diff --git a/usr.sbin/config/misc.h b/usr.sbin/config/misc.h
index 503d6126f19..a5f5939eb78 100644
--- a/usr.sbin/config/misc.h
+++ b/usr.sbin/config/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.2 2001/08/12 12:03:03 heko Exp $ */
+/* $OpenBSD: misc.h,v 1.3 2002/02/16 21:28:01 millert Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -37,8 +37,8 @@
#include "cmd.h"
/* Prototypes */
-int ask_cmd __P((cmd_t *));
-int ask_yn __P((const char *));
+int ask_cmd(cmd_t *);
+int ask_yn(const char *);
#endif /* _MISC_H */
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index dc4ed3f9f38..4b383e4a03a 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkheaders.c,v 1.10 1998/05/14 21:16:44 deraadt Exp $ */
+/* $OpenBSD: mkheaders.c,v 1.11 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: mkheaders.c,v 1.12 1997/02/02 21:12:34 thorpej Exp $ */
/*
@@ -53,10 +53,10 @@
#include <string.h>
#include "config.h"
-static int emitcnt __P((struct nvlist *));
-static int emitopt __P((struct nvlist *));
-static int err __P((const char *, char *, FILE *));
-static char *cntname __P((const char *));
+static int emitcnt(struct nvlist *);
+static int emitopt(struct nvlist *);
+static int err(const char *, char *, FILE *);
+static char *cntname(const char *);
/*
* Make headers containing counts, as needed.
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index 890deac0333..ad08c5174e8 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkioconf.c,v 1.17 2001/11/10 20:46:07 maja Exp $ */
+/* $OpenBSD: mkioconf.c,v 1.18 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: mkioconf.c,v 1.41 1996/11/11 14:18:49 mycroft Exp $ */
/*
@@ -55,15 +55,15 @@
/*
* Make ioconf.c.
*/
-static int cforder __P((const void *, const void *));
-static int emitcfdata __P((FILE *));
-static int emitexterns __P((FILE *));
-static int emithdr __P((FILE *));
-static int emitloc __P((FILE *));
-static int emitlocnames __P((FILE *));
-static int emitpseudo __P((FILE *));
-static int emitpv __P((FILE *));
-static int emitroots __P((FILE *));
+static int cforder(const void *, const void *);
+static int emitcfdata(FILE *);
+static int emitexterns(FILE *);
+static int emithdr(FILE *);
+static int emitloc(FILE *);
+static int emitlocnames(FILE *);
+static int emitpseudo(FILE *);
+static int emitpv(FILE *);
+static int emitroots(FILE *);
#define SEP(pos, max) (((u_int)(pos) % (max)) == 0 ? "\n\t" : " ")
@@ -469,7 +469,7 @@ emitpseudo(fp)
if (fputs("\n/* pseudo-devices */\n", fp) < 0)
return (1);
for (i = allpseudo; i != NULL; i = i->i_next)
- if (fprintf(fp, "extern void %sattach __P((int));\n",
+ if (fprintf(fp, "extern void %sattach(int);\n",
i->i_base->d_name) < 0)
return (1);
if (fputs("\nchar *pdevnames[] = {\n", fp) < 0)
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 962ea278548..1e6ea16bb0a 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkmakefile.c,v 1.9 2001/12/05 10:11:23 deraadt Exp $ */
+/* $OpenBSD: mkmakefile.c,v 1.10 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: mkmakefile.c,v 1.34 1997/02/02 21:12:36 thorpej Exp $ */
/*
@@ -58,23 +58,23 @@
* Make the Makefile.
*/
-static const char *srcpath __P((struct files *));
+static const char *srcpath(struct files *);
-static int emitdefs __P((FILE *));
-static int emitfiles __P((FILE *, int));
+static int emitdefs(FILE *);
+static int emitfiles(FILE *, int);
-static int emitobjs __P((FILE *));
-static int emitcfiles __P((FILE *));
-static int emitsfiles __P((FILE *));
-static int emitrules __P((FILE *));
-static int emitload __P((FILE *));
+static int emitobjs(FILE *);
+static int emitcfiles(FILE *);
+static int emitsfiles(FILE *);
+static int emitrules(FILE *);
+static int emitload(FILE *);
int
mkmakefile()
{
register FILE *ifp, *ofp;
register int lineno;
- register int (*fn) __P((FILE *));
+ register int (*fn)(FILE *);
register char *ifname;
char line[BUFSIZ], buf[200];
diff --git a/usr.sbin/config/mkswap.c b/usr.sbin/config/mkswap.c
index 57d58a6b19b..7b7367858d4 100644
--- a/usr.sbin/config/mkswap.c
+++ b/usr.sbin/config/mkswap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkswap.c,v 1.7 1996/11/12 08:37:58 niklas Exp $ */
+/* $OpenBSD: mkswap.c,v 1.8 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: mkswap.c,v 1.5 1996/08/31 20:58:27 mycroft Exp $ */
/*
@@ -53,7 +53,7 @@
#include "config.h"
#include "sem.h"
-static int mkoneswap __P((struct config *));
+static int mkoneswap(struct config *);
/*
* Make the various swap*.c files. Nothing to do for generic swap.
@@ -120,7 +120,7 @@ mkoneswap(cf)
goto wrerror;
mountroot =
cf->cf_root->nv_str == s_nfs ? "nfs_mountroot" : "dk_mountroot";
- if (fprintf(fp, "int (*mountroot) __P((void)) = %s;\n", mountroot) < 0)
+ if (fprintf(fp, "int (*mountroot)(void) = %s;\n", mountroot) < 0)
goto wrerror;
if (fclose(fp)) {
diff --git a/usr.sbin/config/pack.c b/usr.sbin/config/pack.c
index 8cc8659ff5a..cf589f93143 100644
--- a/usr.sbin/config/pack.c
+++ b/usr.sbin/config/pack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pack.c,v 1.9 1999/01/19 01:11:25 niklas Exp $ */
+/* $OpenBSD: pack.c,v 1.10 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: pack.c,v 1.5 1996/08/31 21:15:11 mycroft Exp $ */
/*
@@ -88,7 +88,7 @@
* (So it goes.)
*/
-typedef int (*vec_cmp_func) __P((const void *, int, int));
+typedef int (*vec_cmp_func)(const void *, int, int);
#define TAILHSIZE 128
#define PVHASH(i) ((i) & (TAILHSIZE - 1))
@@ -103,21 +103,21 @@ static int locspace;
static int pvecspace;
static int longest_pvec;
-static void packdevi __P((void));
-static void packlocs __P((void));
-static void packpvec __P((void));
-
-static void addparents __P((struct devi *src, struct devi *dst));
-static int nparents __P((struct devi **, struct devbase *, int));
-static int sameas __P((struct devi *, struct devi *));
-static int findvec __P((const void *, int, int, vec_cmp_func, int));
-static int samelocs __P((const void *, int, int));
-static int addlocs __P((const char **, int));
-static int loclencmp __P((const void *, const void *));
-static int samepv __P((const void *, int, int));
-static int addpv __P((short *, int));
-static int pvlencmp __P((const void *, const void *));
-static void resettails __P((void));
+static void packdevi(void);
+static void packlocs(void);
+static void packpvec(void);
+
+static void addparents(struct devi *src, struct devi *dst);
+static int nparents(struct devi **, struct devbase *, int);
+static int sameas(struct devi *, struct devi *);
+static int findvec(const void *, int, int, vec_cmp_func, int);
+static int samelocs(const void *, int, int);
+static int addlocs(const char **, int);
+static int loclencmp(const void *, const void *);
+static int samepv(const void *, int, int);
+static int addpv(short *, int);
+static int pvlencmp(const void *, const void *);
+static void resettails(void);
void
pack()
diff --git a/usr.sbin/config/scan.l b/usr.sbin/config/scan.l
index 739e8022cb0..7d55ef8c504 100644
--- a/usr.sbin/config/scan.l
+++ b/usr.sbin/config/scan.l
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: scan.l,v 1.14 2001/01/23 06:02:59 angelos Exp $ */
+/* $OpenBSD: scan.l,v 1.15 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: scan.l,v 1.13 1997/02/02 21:12:37 thorpej Exp $ */
/*
@@ -70,7 +70,7 @@ struct incl {
int in_ateof; /* token to insert at EOF */
};
static struct incl *incl;
-static int endinclude __P((void));
+static int endinclude(void);
#define yywrap() 1
diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c
index 8e23e9b0d58..2abf276e3b9 100644
--- a/usr.sbin/config/sem.c
+++ b/usr.sbin/config/sem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sem.c,v 1.22 2001/12/05 10:11:23 deraadt Exp $ */
+/* $OpenBSD: sem.c,v 1.23 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: sem.c,v 1.10 1996/11/11 23:40:11 gwr Exp $ */
/*
@@ -77,21 +77,21 @@ static struct config **nextcf;
static struct devi **nextdevi;
static struct devi **nextpseudo;
-static int has_errobj __P((struct nvlist *, void *));
-static struct nvlist *addtoattr __P((struct nvlist *, struct devbase *));
-static int exclude __P((struct nvlist *, const char *, const char *));
+static int has_errobj(struct nvlist *, void *);
+static struct nvlist *addtoattr(struct nvlist *, struct devbase *);
+static int exclude(struct nvlist *, const char *, const char *);
static int resolve __P((struct nvlist **, const char *, const char *,
struct nvlist *, int));
static int lresolve __P((struct nvlist **, const char *, const char *,
struct nvlist *, int));
-static struct devi *newdevi __P((const char *, int, struct devbase *d));
-static struct devi *getdevi __P((const char *));
-static const char *concat __P((const char *, int));
-static char *extend __P((char *, const char *));
-static int split __P((const char *, size_t, char *, size_t, int *));
-static void selectbase __P((struct devbase *, struct deva *));
-static int onlist __P((struct nvlist *, void *));
-static const char **fixloc __P((const char *, struct attr *, struct nvlist *));
+static struct devi *newdevi(const char *, int, struct devbase *d);
+static struct devi *getdevi(const char *);
+static const char *concat(const char *, int);
+static char *extend(char *, const char *);
+static int split(const char *, size_t, char *, size_t, int *);
+static void selectbase(struct devbase *, struct deva *);
+static int onlist(struct nvlist *, void *);
+static const char **fixloc(const char *, struct attr *, struct nvlist *);
void
initsem()
diff --git a/usr.sbin/config/sem.h b/usr.sbin/config/sem.h
index 2e6ab44ee59..89dfa079738 100644
--- a/usr.sbin/config/sem.h
+++ b/usr.sbin/config/sem.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sem.h,v 1.8 2001/01/23 17:43:21 deraadt Exp $ */
+/* $OpenBSD: sem.h,v 1.9 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: sem.h,v 1.6 1996/11/11 23:40:10 gwr Exp $ */
/*
@@ -45,27 +45,27 @@
* from: @(#)sem.h 8.1 (Berkeley) 6/6/93
*/
-void enddefs __P((void));
+void enddefs(void);
-void setdefmaxusers __P((int, int, int));
-void setmaxusers __P((int));
-int defattr __P((const char *, struct nvlist *));
+void setdefmaxusers(int, int, int);
+void setmaxusers(int);
+int defattr(const char *, struct nvlist *);
void defdev __P((struct devbase *, int, struct nvlist *,
struct nvlist *));
void defdevattach __P((struct deva *, struct devbase *,
struct nvlist *, struct nvlist *));
-struct devbase *getdevbase __P((const char *name));
-struct deva *getdevattach __P((const char *name));
-struct attr *getattr __P((const char *name));
-void setmajor __P((struct devbase *d, int n));
-void addconf __P((struct config *));
-void setconf __P((struct nvlist **, const char *, struct nvlist *));
-void adddev __P((const char *, const char *, struct nvlist *, int, int));
-void enabledev __P((const char *, const char *));
-void addpseudo __P((const char *name, int number));
-const char *ref __P((const char *name));
-const char *starref __P((const char *name));
-const char *wildref __P((const char *name));
+struct devbase *getdevbase(const char *name);
+struct deva *getdevattach(const char *name);
+struct attr *getattr(const char *name);
+void setmajor(struct devbase *d, int n);
+void addconf(struct config *);
+void setconf(struct nvlist **, const char *, struct nvlist *);
+void adddev(const char *, const char *, struct nvlist *, int, int);
+void enabledev(const char *, const char *);
+void addpseudo(const char *name, int number);
+const char *ref(const char *name);
+const char *starref(const char *name);
+const char *wildref(const char *name);
extern const char *s_generic;
extern const char *s_nfs;
diff --git a/usr.sbin/config/ukc.c b/usr.sbin/config/ukc.c
index 8e70d42fe5e..8d0db1cdb97 100644
--- a/usr.sbin/config/ukc.c
+++ b/usr.sbin/config/ukc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukc.c,v 1.6 2001/12/05 10:11:23 deraadt Exp $ */
+/* $OpenBSD: ukc.c,v 1.7 2002/02/16 21:28:01 millert Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -30,7 +30,7 @@
*/
#ifndef LINT
-static char rcsid[] = "$OpenBSD: ukc.c,v 1.6 2001/12/05 10:11:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ukc.c,v 1.7 2002/02/16 21:28:01 millert Exp $";
#endif
#include <sys/types.h>
@@ -51,8 +51,8 @@ static char rcsid[] = "$OpenBSD: ukc.c,v 1.6 2001/12/05 10:11:23 deraadt Exp $";
#include "ukc.h"
#include "exec.h"
-void init __P((void));
-void usage __P((void));
+void init(void);
+void usage(void);
int ukc_mod_kernel = 0;
diff --git a/usr.sbin/config/ukc.h b/usr.sbin/config/ukc.h
index 7745e9fe742..ef82f1e5501 100644
--- a/usr.sbin/config/ukc.h
+++ b/usr.sbin/config/ukc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukc.h,v 1.6 2001/12/05 10:11:23 deraadt Exp $ */
+/* $OpenBSD: ukc.h,v 1.7 2002/02/16 21:28:01 millert Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -117,34 +117,34 @@ extern int oldkernel;
extern int nopdev;
#endif
-struct cfdata *get_cfdata __P((int));
-short *get_locnamp __P((int));
-caddr_t *get_locnames __P((int));
-int *get_extraloc __P((int));
-char *get_pdevnames __P((int));
-struct pdevinit *get_pdevinit __P((int));
+struct cfdata *get_cfdata(int);
+short *get_locnamp(int);
+caddr_t *get_locnames(int);
+int *get_extraloc(int);
+char *get_pdevnames(int);
+struct pdevinit *get_pdevinit(int);
-int more __P(());
-void pnum __P((int));
-void pdevnam __P((short));
-void pdev __P((short));
-int number __P((char *, int *));
-int device __P((char *, int *, short *, short *));
-int attr __P((char *, int *));
-void modify __P((char *, int *));
-void change __P((int));
-void disable __P((int));
-void enable __P((int));
-void show __P((void));
-void common_attr_val __P((short, int *, char));
-void show_attr __P((char *));
-void common_dev __P((char *, int, short, short, char));
-void common_attr __P((char *, int, char));
-void add_read __P((char *, char, char *, int, int *));
-void add __P((char *, int, short, short));
+int more();
+void pnum(int);
+void pdevnam(short);
+void pdev(short);
+int number(char *, int *);
+int device(char *, int *, short *, short *);
+int attr(char *, int *);
+void modify(char *, int *);
+void change(int);
+void disable(int);
+void enable(int);
+void show(void);
+void common_attr_val(short, int *, char);
+void show_attr(char *);
+void common_dev(char *, int, short, short, char);
+void common_attr(char *, int, char);
+void add_read(char *, char, char *, int, int *);
+void add(char *, int, short, short);
-int config __P(());
-void process_history __P((int, char *));
+int config();
+void process_history(int, char *);
#define UC_CHANGE 'c'
#define UC_DISABLE 'd'
diff --git a/usr.sbin/config/util.c b/usr.sbin/config/util.c
index b470ac4c8dd..699ae2acfba 100644
--- a/usr.sbin/config/util.c
+++ b/usr.sbin/config/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.6 1997/07/25 20:12:10 mickey Exp $ */
+/* $OpenBSD: util.c,v 1.7 2002/02/16 21:28:01 millert Exp $ */
/* $NetBSD: util.c,v 1.5 1996/08/31 20:58:29 mycroft Exp $ */
/*
@@ -57,8 +57,8 @@
#include <sys/types.h>
#include "config.h"
-static void nomem __P((void));
-static void vxerror __P((const char *, int, const char *, va_list));
+static void nomem(void);
+static void vxerror(const char *, int, const char *, va_list);
/*
* Malloc, with abort on error.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 02:18:11 +0000