From a579c6a3251fa696510bf56fc35f2311423f79df Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sun, 1 Apr 2018 19:01:08 +0000
Subject: [PATCH] Move the add char portion to its own function.

---
 sys/kern/subr_log.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 5e0077d63ece..109f9eac6fca 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_log.c,v 1.57 2018/03/31 23:12:01 christos Exp $	*/
+/*	$NetBSD: subr_log.c,v 1.58 2018/04/01 19:01:08 christos Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_log.c,v 1.57 2018/03/31 23:12:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_log.c,v 1.58 2018/04/01 19:01:08 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -404,6 +404,18 @@ logskip(struct kern_msgbuf *mbp)
 	}
 }
 
+static void
+logaddchar(struct kern_msgbuf *mbp, int c)
+{
+	mbp->msg_bufc[mbp->msg_bufx++] = c;
+	if (mbp->msg_bufx < 0 || mbp->msg_bufx >= mbp->msg_bufs)
+		mbp->msg_bufx = 0;
+
+	/* If the buffer is full, keep the most recent data. */
+	if (mbp->msg_bufr == mbp->msg_bufx)
+		logskip(mbp);
+}
+
 void
 logputchar(int c)
 {
@@ -431,13 +443,7 @@ logputchar(int c)
 
 	}
 
-	mbp->msg_bufc[mbp->msg_bufx++] = c;
-	if (mbp->msg_bufx < 0 || mbp->msg_bufx >= mbp->msg_bufs)
-		mbp->msg_bufx = 0;
-
-	/* If the buffer is full, keep the most recent data. */
-	if (mbp->msg_bufr == mbp->msg_bufx)
-		logskip(mbp);
+	logaddchar(mbp, c);
 
 out:
 	if (!cold)