Back out revision 1.10. It broke the build of sh, which compiles

this file with warnx() defined as a macro.
This commit is contained in:
John Polstra 1997-11-18 15:23:23 +00:00
parent d44c88d932
commit b0c9a86d12
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=31277

View File

@ -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)