From 520a0876835a9bf8d8392782bf02058e7a984702 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 3 May 2019 18:39:34 +0000 Subject: avoid duplicate "bad argument" error message, also shortening the code --- main.c | 9 +++------ manpath.c | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/main.c b/main.c index bfe918b8..8e8ca894 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.326 2019/05/03 17:31:15 schwarze Exp $ */ +/* $Id: main.c,v 1.327 2019/05/03 18:39:34 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2012, 2014-2019 Ingo Schwarze @@ -300,12 +300,9 @@ main(int argc, char *argv[]) search.outkey = oarg; else { while (oarg != NULL) { - thisarg = oarg; if (manconf_output(&conf.output, - strsep(&oarg, ","), 0) == 0) - continue; - warnx("-O %s: Bad argument", thisarg); - return (int)MANDOCLEVEL_BADARG; + strsep(&oarg, ","), 0) == -1) + return (int)MANDOCLEVEL_BADARG; } } } diff --git a/manpath.c b/manpath.c index 1446787a..703d6328 100644 --- a/manpath.c +++ b/manpath.c @@ -1,4 +1,4 @@ -/* $Id: manpath.c,v 1.38 2019/05/03 18:23:53 schwarze Exp $ */ +/* $Id: manpath.c,v 1.39 2019/05/03 18:39:34 schwarze Exp $ */ /* * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze * Copyright (c) 2011 Kristaps Dzonsons @@ -332,8 +332,7 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile) conf->toc = 1; return 0; default: - if (fromfile) - warnx("-O %s: Bad argument", cp); + warnx("-O %s: Bad argument", cp); return -1; } if (fromfile == 0) -- cgit v1.2.3-56-ge451