This patch replaces uses of warnx where we abort with error since the effect is the same. The exit status however changes from 1 to 2. Non-fatal errors where we continue are unchanged.
Signed-off-by: Herbert Xu <[email protected]> --- ChangeLog | 1 + src/bltin/printf.c | 17 +++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b9b03a..707c24d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * Add ifdefs around MEM_OUT handling in outmem. * Remove unnecessary restoration of format string in printf. * Remove getintmax in printf. + * Use error instead of warnx for fatal errors in printf. 2014-10-13 Eric Blake <[email protected]> diff --git a/src/bltin/printf.c b/src/bltin/printf.c index ebc74ae..4812e40 100644 --- a/src/bltin/printf.c +++ b/src/bltin/printf.c @@ -132,10 +132,8 @@ int printfcmd(int argc, char *argv[]) argv = argptr; format = *argv; - if (!format) { - warnx("usage: printf format [arg ...]"); - goto err; - } + if (!format) + error("usage: printf format [arg ...]"); gargv = ++argv; @@ -190,10 +188,8 @@ pc: fmt += strspn(fmt, SKIP2); ch = *fmt; - if (!ch) { - warnx("missing format character"); - goto err; - } + if (!ch) + error("missing format character"); /* null terminate format string to we can use it as an argument to printf. */ nextch = fmt[1]; @@ -246,8 +242,7 @@ pc: break; } default: - warnx("%s: invalid directive", start); - goto err; + error("%s: invalid directive", start); } *++fmt = nextch; } @@ -255,8 +250,6 @@ pc: out: return rval; -err: - return 1; } -- To unsubscribe from this list: send the line "unsubscribe dash" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
