aboutsummaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/subr_disklabel.c4
-rw-r--r--sys/kern/subr_prf.c8
-rw-r--r--sys/kern/uipc_proto.c4
3 files changed, 9 insertions, 7 deletions
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index e02db040945e..7026b9116c73 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.23 1996/04/19 19:34:19 bde Exp $
+ * $Id: ufs_disksubr.c,v 1.24 1996/05/03 15:05:17 phk Exp $
*/
#include <sys/param.h>
@@ -370,7 +370,7 @@ diskerr(bp, dname, what, pri, blkdone, lp)
int unit = dkunit(bp->b_dev);
int slice = dkslice(bp->b_dev);
int part = dkpart(bp->b_dev);
- register void (*pr) __P((const char *, ...));
+ register int (*pr) __P((const char *, ...));
char partname[2];
char *sname;
int sn;
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index c718a655428a..7968bb085d2f 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)subr_prf.c 8.3 (Berkeley) 1/21/94
- * $Id: subr_prf.c,v 1.34 1996/03/25 17:06:34 jkh Exp $
+ * $Id: subr_prf.c,v 1.35 1996/05/02 09:34:45 phk Exp $
*/
#include "opt_ddb.h"
@@ -267,15 +267,16 @@ logpri(level)
msglogchar('>', NULL);
}
-void
+int
addlog(const char *fmt, ...)
{
register int s;
va_list ap;
+ int retval;
s = splhigh();
va_start(ap, fmt);
- kvprintf(fmt, msglogchar, NULL, 10, ap);
+ retval = kvprintf(fmt, msglogchar, NULL, 10, ap);
splx(s);
va_end(ap);
if (!log_open) {
@@ -287,6 +288,7 @@ addlog(const char *fmt, ...)
va_end(ap);
}
logwakeup();
+ return (retval);
}
int
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index 125e81b8c38a..674f5c518467 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_proto.c 8.1 (Berkeley) 6/10/93
- * $Id: uipc_proto.c,v 1.5 1995/12/02 18:58:55 bde Exp $
+ * $Id: uipc_proto.c,v 1.6 1995/12/14 08:32:08 phk Exp $
*/
#include <sys/param.h>
@@ -59,7 +59,7 @@ static struct protosw localsw[] = {
0, 0, 0, 0,
},
{ 0, 0, 0, 0,
- raw_input, 0, raw_ctlinput, 0,
+ 0, 0, raw_ctlinput, 0,
raw_usrreq,
raw_init, 0, 0, 0,
}