From b0c9a86d123c2bd4961e2c6047cabc0c5ddff068 Mon Sep 17 00:00:00 2001 From: John Polstra Date: Tue, 18 Nov 1997 15:23:23 +0000 Subject: [PATCH] Back out revision 1.10. It broke the build of sh, which compiles this file with warnx() defined as a macro. --- usr.bin/printf/printf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c index 71fb2cbc722..25acd157bac 100644 --- a/usr.bin/printf/printf.c +++ b/usr.bin/printf/printf.c @@ -136,7 +136,8 @@ next: for (start = fmt;; ++fmt) { if (!*fmt) { /* avoid infinite loop */ if (end == 1) { - warnx("missing format character"); + warnx("missing format character", + NULL, NULL); return (1); } end = 1; @@ -185,7 +186,7 @@ next: for (start = fmt;; ++fmt) { } else precision = 0; if (!*fmt) { - warnx("missing format character"); + warnx("missing format character", NULL, NULL); return (1); } @@ -226,7 +227,7 @@ next: for (start = fmt;; ++fmt) { break; } default: - warnx("illegal format character %c", convch); + warnx("illegal format character %c", convch, NULL); return (1); } *fmt = nextch; @@ -359,7 +360,7 @@ getlong(lp) errno = 0; val = strtol(*gargv, &ep, 0); if (*ep != '\0') { - warnx("%s: illegal number", *gargv); + warnx("%s: illegal number", *gargv, NULL); return (1); } if (errno == ERANGE)