summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
authorPatrick Williams <iawillia@us.ibm.com>2013-09-23 14:55:10 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-10-07 10:02:28 -0500
commitb8d7070d329b3a6577ae6c11ae7b1afb27db7a22 (patch)
tree0e93546356b039af78869b5edc86d8d4d1ff08a9 /src/kernel
parent4dc8e90ef55cb15b6a36a8d27ae43a6b2261521b (diff)
downloadtalos-hostboot-b8d7070d329b3a6577ae6c11ae7b1afb27db7a22.tar.gz
talos-hostboot-b8d7070d329b3a6577ae6c11ae7b1afb27db7a22.zip
Make sprintf-class functions comply with standard.
Change-Id: I6a04179bb2c339668450bcbcf608ebef477c5bfe Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6399 Tested-by: Jenkins Server Reviewed-by: Brian H. Horton <brianh@linux.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/console.C49
1 files changed, 23 insertions, 26 deletions
diff --git a/src/kernel/console.C b/src/kernel/console.C
index 892295ac5..eaab1de28 100644
--- a/src/kernel/console.C
+++ b/src/kernel/console.C
@@ -1,29 +1,28 @@
-// IBM_PROLOG_BEGIN_TAG
-// This is an automatically generated prolog.
-//
-// $Source: src/kernel/console.C $
-//
-// IBM CONFIDENTIAL
-//
-// COPYRIGHT International Business Machines Corp. 2010 - 2011
-//
-// p1
-//
-// Object Code Only (OCO) source materials
-// Licensed Internal Code Source Materials
-// IBM HostBoot Licensed Internal Code
-//
-// The source code for this program is not published or other-
-// wise divested of its trade secrets, irrespective of what has
-// been deposited with the U.S. Copyright Office.
-//
-// Origin: 30
-//
-// IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/kernel/console.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2010,2013 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
#include <util/singleton.H>
#include <kernel/console.H>
#include <util/sprintf.H>
-#include <util/functor.H>
#include <stdarg.h>
char kernel_printk_buffer[Console::BUFFER_SIZE];
@@ -48,15 +47,13 @@ int Console::putc(int c)
void printk(const char* str, ...)
{
- using Util::mem_ptr_fun;
using Util::vasprintf;
va_list args;
va_start(args, str);
Console& console = Singleton<Console>::instance();
- vasprintf(mem_ptr_fun(console, &Console::putc),
- str, args);
+ vasprintf(console, str, args);
va_end(args);
}
OpenPOWER on IntegriCloud