From 0b668f95ad59420f80e237f97747649c7b86d123 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 8 Nov 2006 02:16:37 +0000 Subject: 2006-11-08 Samuel Thibault [task #5726 --- ``GCC built-in functions''] * include/printf.h (iprintf): Fix prototype. (vprintf): Add prototype. * kern/printf.c: Include `printf.h'. (vprintf, printf): Fix prototype and return a dumb value. --- ChangeLog | 8 ++++++++ include/printf.h | 4 +++- kern/printf.c | 7 +++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e861e1..7001f26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-11-08 Samuel Thibault + + [task #5726 --- ``GCC built-in functions''] + * include/printf.h (iprintf): Fix prototype. + (vprintf): Add prototype. + * kern/printf.c: Include `printf.h'. + (vprintf, printf): Fix prototype and return a dumb value. + 2006-11-07 Barry deFreese [task #5726 --- ``GCC built-in functions''] diff --git a/include/printf.h b/include/printf.h index e309d21..f5930dc 100644 --- a/include/printf.h +++ b/include/printf.h @@ -44,7 +44,9 @@ extern int sprintf (char *buf, const char *fmt, ...); extern int printf (const char *fmt, ...); extern int indent; -extern int iprintf (const char *fmt, ...); +extern void iprintf (const char *fmt, ...); + +extern int vprintf(const char *fmt, va_list listp); #endif /* _MACH_SA_SYS_PRINTF_H_ */ diff --git a/kern/printf.c b/kern/printf.c index a1f18b0..37543b3 100644 --- a/kern/printf.c +++ b/kern/printf.c @@ -114,6 +114,7 @@ */ #include +#include #include #include #include @@ -511,18 +512,20 @@ void _doprnt( */ extern void cnputc( char, /*not really*/vm_offset_t); -void vprintf(const char *fmt, va_list listp) +int vprintf(const char *fmt, va_list listp) { _doprnt(fmt, &listp, cnputc, 16, 0); + return 0; } /*VARARGS1*/ -void printf(const char *fmt, ...) +int printf(const char *fmt, ...) { va_list listp; va_start(listp, fmt); vprintf(fmt, listp); va_end(listp); + return 0; } int indent = 0; -- cgit v1.2.3