From 21aa6e834558d085efe22f754f7086a01d7ca1b9 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 9 Aug 2018 17:42:27 +0000 Subject: [PATCH] msgbuf: Light detailing (const'ify and bool'itize) --- sys/kern/subr_msgbuf.c | 2 +- sys/kern/subr_prf.c | 4 ++-- sys/sys/msgbuf.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_msgbuf.c b/sys/kern/subr_msgbuf.c index 883cf2a78f63..680fbbb81459 100644 --- a/sys/kern/subr_msgbuf.c +++ b/sys/kern/subr_msgbuf.c @@ -181,7 +181,7 @@ msgbuf_addchar(struct msgbuf *mbp, int c) * carriage returns down this path. So do we still need it? */ void -msgbuf_addstr(struct msgbuf *mbp, int pri, char *str, int filter_cr) +msgbuf_addstr(struct msgbuf *mbp, int pri, const char *str, int filter_cr) { u_int seq; size_t len, prefix_len; diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 644e4f0ae2c6..666677c4453c 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -120,7 +120,7 @@ static void putchar(int ch, void *arg); static char *ksprintn(char *nbuf, uintmax_t num, int base, int *len, int upper); static void snprintf_func(int ch, void *arg); -static int msgbufmapped; /* Set when safe to use msgbuf */ +static bool msgbufmapped; /* Set when safe to use msgbuf */ int msgbuftrigger; struct msgbuf *msgbufp; @@ -1030,7 +1030,7 @@ msgbufinit(void *ptr, int size) msgbuf_addstr(msgbufp, -1, BOOT_TAG, 0); if (msgbufmapped && oldp != msgbufp) msgbuf_copy(oldp, msgbufp); - msgbufmapped = 1; + msgbufmapped = true; oldp = msgbufp; } diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h index f24ee9c425bf..9585dabda149 100644 --- a/sys/sys/msgbuf.h +++ b/sys/sys/msgbuf.h @@ -71,7 +71,7 @@ extern struct mtx msgbuf_lock; void msgbufinit(void *ptr, int size); void msgbuf_addchar(struct msgbuf *mbp, int c); -void msgbuf_addstr(struct msgbuf *mbp, int pri, char *str, int filter_cr); +void msgbuf_addstr(struct msgbuf *mbp, int pri, const char *str, int filter_cr); void msgbuf_clear(struct msgbuf *mbp); void msgbuf_copy(struct msgbuf *src, struct msgbuf *dst); int msgbuf_getbytes(struct msgbuf *mbp, char *buf, int buflen);