diff options
| -rw-r--r-- | sys/ddb/db_output.c | 4 | ||||
| -rw-r--r-- | sys/ddb/db_output.h | 4 | ||||
| -rw-r--r-- | sys/kern/subr_disk.c | 2 | ||||
| -rw-r--r-- | sys/kern/subr_prf.c | 8 | ||||
| -rw-r--r-- | sys/sys/syslog.h | 4 | ||||
| -rw-r--r-- | sys/sys/systm.h | 4 | ||||
| -rw-r--r-- | sys/vm/vm_extern.h | 4 | ||||
| -rw-r--r-- | sys/vm/vm_glue.c | 4 | ||||
| -rw-r--r-- | sys/vm/vm_map.c | 4 | ||||
| -rw-r--r-- | sys/vm/vm_map.h | 2 | ||||
| -rw-r--r-- | sys/vm/vm_object.c | 4 | ||||
| -rw-r--r-- | sys/vm/vm_object.h | 2 |
12 files changed, 24 insertions, 22 deletions
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index 7a6514661b9..e6839633d4e 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_output.c,v 1.5 1996/04/21 22:19:05 deraadt Exp $ */ +/* $OpenBSD: db_output.c,v 1.6 1996/07/23 23:54:27 deraadt Exp $ */ /* $NetBSD: db_output.c,v 1.13 1996/04/01 17:27:14 christos Exp $ */ /* @@ -201,7 +201,7 @@ db_print_position() extern int db_radix; /*VARARGS1*/ -void +int #if __STDC__ db_printf(const char *fmt, ...) #else diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h index 3a1f7f7ca1e..e4792ef5cec 100644 --- a/sys/ddb/db_output.h +++ b/sys/ddb/db_output.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_output.h,v 1.5 1996/04/21 22:19:07 deraadt Exp $ */ +/* $OpenBSD: db_output.h,v 1.6 1996/07/23 23:54:28 deraadt Exp $ */ /* $NetBSD: db_output.h,v 1.9 1996/04/04 05:13:50 cgd Exp $ */ /* @@ -36,7 +36,7 @@ void db_force_whitespace __P((void)); void db_putchar __P((int)); int db_print_position __P((void)); -void db_printf __P((const char *, ...)) +int db_printf __P((const char *, ...)) __kprintf_attribute__((__format__(__kprintf__,1,2))); void kdbprintf __P((const char *, ...)) __kprintf_attribute__((__format__(__kprintf__,1,2))); diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 5f6880467cc..dc158928dd2 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -210,7 +210,7 @@ diskerr(bp, dname, what, pri, blkdone, lp) register struct disklabel *lp; { int unit = dkunit(bp->b_dev), part = dkpart(bp->b_dev); - register void (*pr) __P((const char *, ...)); + register int (*pr) __P((const char *, ...)); char partname = 'a' + part; int sn; diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index b37be3bf15b..c6d49dfeda6 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prf.c,v 1.8 1996/07/19 23:13:39 dm Exp $ */ +/* $OpenBSD: subr_prf.c,v 1.9 1996/07/23 23:54:19 deraadt Exp $ */ /* $NetBSD: subr_prf.c,v 1.25 1996/04/22 01:38:46 christos Exp $ */ /*- @@ -289,7 +289,7 @@ logpri(level) putchar('>', TOLOG, NULL); } -void +int #ifdef __STDC__ addlog(const char *fmt, ...) #else @@ -312,9 +312,10 @@ addlog(fmt, va_alist) va_end(ap); } logwakeup(); + return (0); } -void +int #ifdef __STDC__ printf(const char *fmt, ...) #else @@ -334,6 +335,7 @@ printf(fmt, va_alist) if (!panicstr) logwakeup(); consintr = savintr; /* reenable interrupts */ + return (0); } /* diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h index ac9c7eaf339..8776b8cfd8b 100644 --- a/sys/sys/syslog.h +++ b/sys/sys/syslog.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syslog.h,v 1.3 1996/04/21 22:32:01 deraadt Exp $ */ +/* $OpenBSD: syslog.h,v 1.4 1996/07/23 23:54:15 deraadt Exp $ */ /* $NetBSD: syslog.h,v 1.14 1996/04/03 20:46:44 christos Exp $ */ /* @@ -193,7 +193,7 @@ __END_DECLS void logpri __P((int)); void log __P((int, const char *, ...)) __kprintf_attribute__((__format__(__kprintf__,2,3))); -void addlog __P((const char *, ...)) +int addlog __P((const char *, ...)) __kprintf_attribute__((__format__(__kprintf__,1,2))); void logwakeup __P((void)); diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 73f833fb7b0..89195ccbf3a 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: systm.h,v 1.7 1996/07/02 06:52:06 niklas Exp $ */ +/* $OpenBSD: systm.h,v 1.8 1996/07/23 23:54:17 deraadt Exp $ */ /* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */ /*- @@ -138,7 +138,7 @@ void panic __P((const char *, ...)) #else __attribute__((__noreturn__)); #endif -void printf __P((const char *, ...)) +int printf __P((const char *, ...)) __kprintf_attribute__((__format__(__kprintf__,1,2))); void uprintf __P((const char *, ...)) __kprintf_attribute__((__format__(__kprintf__,1,2))); diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 64a732b223d..dc52e27d09c 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_extern.h,v 1.6 1996/06/10 19:26:51 niklas Exp $ */ +/* $OpenBSD: vm_extern.h,v 1.7 1996/07/23 23:54:21 deraadt Exp $ */ /* $NetBSD: vm_extern.h,v 1.20 1996/04/23 12:25:23 christos Exp $ */ /*- @@ -66,7 +66,7 @@ int sstk __P((struct proc *, void *, int *)); void assert_wait __P((void *, boolean_t)); int grow __P((struct proc *, vm_offset_t)); -void iprintf __P((void (*)(const char *, ...), const char *, ...)); +void iprintf __P((int (*)(const char *, ...), const char *, ...)); int kernacc __P((caddr_t, int, int)); int kinfo_loadavg __P((int, char *, int *, int, int *)); int kinfo_meter __P((int, caddr_t, int *, int, int *)); diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 45f49d1987c..2bbde4ea4f8 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_glue.c,v 1.18 1996/06/24 20:00:51 pefo Exp $ */ +/* $OpenBSD: vm_glue.c,v 1.19 1996/07/23 23:54:22 deraadt Exp $ */ /* $NetBSD: vm_glue.c,v 1.55.4.1 1996/06/13 17:25:45 cgd Exp $ */ /* @@ -613,7 +613,7 @@ int indent = 0; /*ARGSUSED2*/ void #if __STDC__ -iprintf(void (*pr)(const char *, ...), const char *fmt, ...) +iprintf(int (*pr)(const char *, ...), const char *fmt, ...) #else iprintf(pr, fmt /* , va_alist */) void (*pr)(); diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index d8d952f4019..f8089e268ba 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_map.c,v 1.2 1996/03/03 17:45:30 niklas Exp $ */ +/* $OpenBSD: vm_map.c,v 1.3 1996/07/23 23:54:23 deraadt Exp $ */ /* $NetBSD: vm_map.c,v 1.23 1996/02/10 00:08:08 christos Exp $ */ /* @@ -2589,7 +2589,7 @@ void _vm_map_print(map, full, pr) register vm_map_t map; boolean_t full; - void (*pr) __P((const char *, ...)); + int (*pr) __P((const char *, ...)); { register vm_map_entry_t entry; extern int indent; diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 63c47111c4f..cd3e305710f 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -218,7 +218,7 @@ int vm_map_clean __P((vm_map_t, vm_offset_t, vm_offset_t, boolean_t, boolean_t)); void vm_map_print __P((vm_map_t, boolean_t)); void _vm_map_print __P((vm_map_t, boolean_t, - void (*)(const char *, ...))); + int (*)(const char *, ...))); int vm_map_protect __P((vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t, boolean_t)); void vm_map_reference __P((vm_map_t)); diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 70c666027c2..c4d3f285422 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_object.c,v 1.4 1996/04/19 16:10:51 niklas Exp $ */ +/* $OpenBSD: vm_object.c,v 1.5 1996/07/23 23:54:25 deraadt Exp $ */ /* $NetBSD: vm_object.c,v 1.34 1996/02/28 22:35:35 gwr Exp $ */ /* @@ -1418,7 +1418,7 @@ void _vm_object_print(object, full, pr) vm_object_t object; boolean_t full; - void (*pr) __P((const char *, ...)); + int (*pr) __P((const char *, ...)); { register vm_page_t p; extern indent; diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index fa12d563e6e..3ec9af99a45 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -167,7 +167,7 @@ void vm_object_prefer __P((vm_object_t, vm_offset_t, vm_offset_t *)); void vm_object_print __P((vm_object_t, boolean_t)); void _vm_object_print __P((vm_object_t, boolean_t, - void (*)(const char *, ...))); + int (*)(const char *, ...))); void vm_object_reference __P((vm_object_t)); void vm_object_remove __P((vm_pager_t)); void vm_object_setpager __P((vm_object_t, |