From 5146404da8f8cf00774f8960469cba3f00d82c54 Mon Sep 17 00:00:00 2001 From: kleink Date: Wed, 19 Jan 2005 14:13:21 +0000 Subject: [PATCH] Rename wprintf() to w_printf() to prevent a clash with the 9899/AMD1 function of the same name; suggested by J.T. Conklin on tech-userlevel. --- regress/lib/libc/gen/humanize_number/hntest.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/regress/lib/libc/gen/humanize_number/hntest.c b/regress/lib/libc/gen/humanize_number/hntest.c index 7c151f789a65..477741de18f1 100644 --- a/regress/lib/libc/gen/humanize_number/hntest.c +++ b/regress/lib/libc/gen/humanize_number/hntest.c @@ -1,4 +1,4 @@ -/* $NetBSD: hntest.c,v 1.2 2004/07/16 23:28:20 enami Exp $ */ +/* $NetBSD: hntest.c,v 1.3 2005/01/19 14:13:21 kleink Exp $ */ #include #include @@ -71,7 +71,7 @@ const struct hnflags normal_flags[] = { const char * formatflags(char *, size_t, const struct hnflags *, size_t, int); void newline(void); -void wprintf(const char *, ...); +void w_printf(const char *, ...); int main(int, char *[]); const char * @@ -120,7 +120,7 @@ newline(void) } void -wprintf(const char *fmt, ...) +w_printf(const char *fmt, ...) { char buf[80]; va_list ap; @@ -177,18 +177,18 @@ main(int argc, char *argv[]) (rv == -1 || strcmp(buf, ho->ho_retstr) == 0)) continue; - wprintf("humanize_number(\"%s\", %d, %" PRId64 ",", + w_printf("humanize_number(\"%s\", %d, %" PRId64 ",", ho->ho_retstr, ho->ho_len, ho->ho_num); - wprintf("\"%s\",", ho->ho_suffix); - wprintf("%s,", formatflags(fbuf, sizeof(fbuf), scale_flags, + w_printf("\"%s\",", ho->ho_suffix); + w_printf("%s,", formatflags(fbuf, sizeof(fbuf), scale_flags, sizeof(scale_flags) / sizeof(scale_flags[0]), ho->ho_scale)); - wprintf("%s)", formatflags(fbuf, sizeof(fbuf), normal_flags, + w_printf("%s)", formatflags(fbuf, sizeof(fbuf), normal_flags, sizeof(normal_flags) / sizeof(normal_flags[0]), ho->ho_flags)); - wprintf("= %d,", ho->ho_retval); - wprintf("but got"); - wprintf("%d/[%s]", rv, rv == -1 ? "" : buf); + w_printf("= %d,", ho->ho_retval); + w_printf("but got"); + w_printf("%d/[%s]", rv, rv == -1 ? "" : buf); newline(); error = 1; }