summaryrefslogtreecommitdiffstats
path: root/usr.bin/printf
diff options
context:
space:
mode:
authorjdp <jdp@FreeBSD.org>1997-11-18 15:23:23 +0000
committerjdp <jdp@FreeBSD.org>1997-11-18 15:23:23 +0000
commit0fdbfe2bab2c910b5f1029f7f32c5ba09999d2cb (patch)
tree35d0fdc52451ae1e0025eaf4e940f9060773617e /usr.bin/printf
parent4addf72045de583e69d7920bcc0637808e7a98d2 (diff)
downloadFreeBSD-src-0fdbfe2bab2c910b5f1029f7f32c5ba09999d2cb.zip
FreeBSD-src-0fdbfe2bab2c910b5f1029f7f32c5ba09999d2cb.tar.gz
Back out revision 1.10. It broke the build of sh, which compiles
this file with warnx() defined as a macro.
Diffstat (limited to 'usr.bin/printf')
-rw-r--r--usr.bin/printf/printf.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 71fb2cb..25acd15 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)
OpenPOWER on IntegriCloud