From 91c3cbfe1fbbbd0e7c85a2fcbf685d437f6e4028 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Fri, 27 Feb 2009 13:28:54 +0000 Subject: [PATCH] Remove redundant code in printf() and vprintf(). printf() and vprintf() are exactly the same, except the way arguments are passed. Just like we see in other pieces of code (i.e. libc's printf()), implement printf() using vprintf(). Submitted by: Christoph Mallon --- sys/kern/subr_prf.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index c3111207b05..5c34f408751 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -295,39 +295,12 @@ int printf(const char *fmt, ...) { va_list ap; - struct putchar_arg pca; int retval; -#ifdef PRINTF_BUFR_SIZE - char bufr[PRINTF_BUFR_SIZE]; -#endif va_start(ap, fmt); - pca.tty = NULL; - pca.flags = TOCONS | TOLOG; - pca.pri = -1; -#ifdef PRINTF_BUFR_SIZE - pca.p_bufr = bufr; - pca.p_next = pca.p_bufr; - pca.n_bufr = sizeof(bufr); - pca.remain = sizeof(bufr); - *pca.p_next = '\0'; -#else - /* Don't buffer console output. */ - pca.p_bufr = NULL; -#endif - - retval = kvprintf(fmt, putchar, &pca, 10, ap); + retval = vprintf(fmt, ap); va_end(ap); -#ifdef PRINTF_BUFR_SIZE - /* Write any buffered console output: */ - if (*pca.p_bufr != '\0') - cnputs(pca.p_bufr); -#endif - - if (!panicstr) - msgbuftrigger = 1; - return (retval); }