svn commit: r189104 - head/sys/kern

[Ed Schouten]

Author: ed
Date: Fri Feb 27 13:28:54 2009
New Revision: 189104
URL: http://svn.freebsd.org/changeset/base/189104

Log:
  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 <christoph mallon gmx de>

Modified:
  head/sys/kern/subr_prf.c

Modified: head/sys/kern/subr_prf.c
==============================================================================
--- head/sys/kern/subr_prf.c	Fri Feb 27 13:22:26 2009	(r189103)
+++ head/sys/kern/subr_prf.c	Fri Feb 27 13:28:54 2009	(r189104)
@@ -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);
 }