diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2009-02-27 13:28:54 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2009-02-27 13:28:54 +0000 |
| commit | 91c3cbfe1fbbbd0e7c85a2fcbf685d437f6e4028 (patch) | |
| tree | 828525320556a9982ee564afa514f2e537c39051 | |
| parent | 61cab5d638673b8cd76a7346cb6585e84b39c556 (diff) | |
Notes
| -rw-r--r-- | sys/kern/subr_prf.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index c3111207b05c..5c34f4087512 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); } |
