From 64b93d175ac6eb739036b394fbb0766fbf06f5b7 Mon Sep 17 00:00:00 2001 From: Robert Morris Date: Tue, 27 Aug 2019 13:13:03 -0400 Subject: user printf(1 -> printf( --- user/printf.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'user/printf.c') diff --git a/user/printf.c b/user/printf.c index f3b3282..5c5c782 100644 --- a/user/printf.c +++ b/user/printf.c @@ -49,13 +49,11 @@ printptr(int fd, uint64 x) { // Print to the given fd. Only understands %d, %x, %p, %s. void -printf(int fd, const char *fmt, ...) +vprintf(int fd, const char *fmt, va_list ap) { - va_list ap; char *s; int c, i, state; - va_start(ap, fmt); state = 0; for(i = 0; fmt[i]; i++){ c = fmt[i] & 0xff; @@ -95,3 +93,21 @@ printf(int fd, const char *fmt, ...) } } } + +void +fprintf(int fd, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vprintf(fd, fmt, ap); +} + +void +printf(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vprintf(1, fmt, ap); +} -- cgit v1.2.3