Mostly just a rename and removing some of the unused parts of the interface.
Signed-off-by: Barret Rhoden <[email protected]> --- user/parlib/debug.c | 6 +++--- user/parlib/debugfmt.c | 14 ++------------ user/parlib/include/stdio.h | 8 +++----- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/user/parlib/debug.c b/user/parlib/debug.c index ddb3c97b3a55..204cca4bac6c 100644 --- a/user/parlib/debug.c +++ b/user/parlib/debug.c @@ -33,14 +33,14 @@ static void putch(int ch, debugbuf_t **b) (*b)->cnt++; } -int ros_vdebug(const char *fmt, va_list ap) +int akaros_vprintf(const char *fmt, va_list ap) { debugbuf_t b; debugbuf_t *bp = &b; b.idx = 0; b.cnt = 0; - ros_vdebugfmt((void*)putch, (void*)&bp, fmt, ap); + akaros_vprintfmt((void*)putch, (void*)&bp, fmt, ap); sys_cputs(b.buf, b.idx); return b.cnt; @@ -53,7 +53,7 @@ int akaros_printf(const char *format, ...) va_start(ap, format); if (in_vcore_context()) - ret = ros_vdebug(format, ap); + ret = akaros_vprintf(format, ap); else ret = vprintf(format, ap); va_end(ap); diff --git a/user/parlib/debugfmt.c b/user/parlib/debugfmt.c index d6f1a2acf1fb..1392b68133ca 100644 --- a/user/parlib/debugfmt.c +++ b/user/parlib/debugfmt.c @@ -24,8 +24,8 @@ static void printnum(void (*putch)(int, void**), void **putdat, } // Main function to format and print a string. -void ros_debugfmt(void (*putch)(int, void**), void **putdat, const char *fmt, ...); -void ros_vdebugfmt(void (*putch)(int, void**), void **putdat, const char *fmt, va_list ap) +void akaros_vprintfmt(void (*putch)(int, void**), void **putdat, + const char *fmt, va_list ap) { register const char *p; const char *last_fmt; @@ -194,13 +194,3 @@ void ros_vdebugfmt(void (*putch)(int, void**), void **putdat, const char *fmt, v } } } - -void ros_debugfmt(void (*putch)(int, void**), void **putdat, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - ros_vdebugfmt(putch, putdat, fmt, ap); - va_end(ap); -} - diff --git a/user/parlib/include/stdio.h b/user/parlib/include/stdio.h index 45bea7a52c9a..e752bc247fd0 100644 --- a/user/parlib/include/stdio.h +++ b/user/parlib/include/stdio.h @@ -15,11 +15,9 @@ __BEGIN_DECLS -void ros_debugfmt(void (*putch)(int, void**), void **putdat, const char *fmt, - ...); -void ros_vdebugfmt(void (*putch)(int, void**), void **putdat, const char *fmt, - va_list); -int ros_vdebug(const char *fmt, va_list); +void akaros_vprintfmt(void (*putch)(int, void**), void **putdat, + const char *fmt, va_list); +int akaros_vprintf(const char *fmt, va_list); #ifdef PRINTD_DEBUG #define printd(args...) printf(args) -- 2.6.0.rc2.230.g3dd15c0 -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
