diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_log.c | 13 | ||||
| -rw-r--r-- | sys/kern/subr_prf.c | 16 |
2 files changed, 13 insertions, 16 deletions
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index f29d76c..60b1c3e 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_log.c 8.1 (Berkeley) 6/10/93 - * $Id: subr_log.c,v 1.26 1998/01/24 02:54:34 eivind Exp $ + * $Id: subr_log.c,v 1.27 1998/02/20 13:46:56 bde Exp $ */ /* @@ -39,6 +39,7 @@ */ #include "opt_devfs.h" +#include "opt_msgbuf.h" #include <sys/param.h> #include <sys/systm.h> @@ -138,16 +139,16 @@ logread(dev, uio, flag) while (uio->uio_resid > 0) { l = mbp->msg_bufx - mbp->msg_bufr; if (l < 0) - l = MSG_BSIZE - mbp->msg_bufr; + l = mbp->msg_size - mbp->msg_bufr; l = min(l, uio->uio_resid); if (l == 0) break; - error = uiomove((caddr_t)&mbp->msg_bufc[mbp->msg_bufr], - (int)l, uio); + error = uiomove((caddr_t)msgbufp->msg_ptr + mbp->msg_bufr, + (int)l, uio); if (error) break; mbp->msg_bufr += l; - if (mbp->msg_bufr >= MSG_BSIZE) + if (mbp->msg_bufr >= mbp->msg_size) mbp->msg_bufr = 0; } return (error); @@ -215,7 +216,7 @@ logioctl(dev, com, data, flag, p) l = msgbufp->msg_bufx - msgbufp->msg_bufr; splx(s); if (l < 0) - l += MSG_BSIZE; + l += msgbufp->msg_size; *(int *)data = l; break; diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 34191af..9124f67 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 - * $Id: subr_prf.c,v 1.43 1997/10/12 20:23:58 phk Exp $ + * $Id: subr_prf.c,v 1.44 1997/12/28 05:03:33 bde Exp $ */ +#include "opt_msgbuf.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/msgbuf.h> @@ -586,18 +588,12 @@ msglogchar(int c, void *dummyarg) if (c != '\0' && c != '\r' && c != 0177 && msgbufmapped) { mbp = msgbufp; - if (mbp->msg_magic != MSG_MAGIC || - mbp->msg_bufx >= MSG_BSIZE || - mbp->msg_bufr >= MSG_BSIZE) { - bzero(mbp, sizeof(struct msgbuf)); - mbp->msg_magic = MSG_MAGIC; - } - mbp->msg_bufc[mbp->msg_bufx++] = c; - if (mbp->msg_bufx >= MSG_BSIZE) + mbp->msg_ptr[mbp->msg_bufx++] = c; + if (mbp->msg_bufx >= mbp->msg_size) mbp->msg_bufx = 0; /* If the buffer is full, keep the most recent data. */ if (mbp->msg_bufr == mbp->msg_bufx) { - if (++mbp->msg_bufr >= MSG_BSIZE) + if (++mbp->msg_bufr >= mbp->msg_size) mbp->msg_bufr = 0; } } |
