mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Johannes Zink <j.zink@pengutronix.de>
To: barebox@lists.infradead.org
Cc: patchwork-jzi@pengutronix.de, Johannes Zink <j.zink@pengutronix.de>
Subject: [PATCH v2 1/3] imx-usb-loader: exit with success when displaying help on purpose
Date: Fri,  5 May 2023 17:52:46 +0200	[thread overview]
Message-ID: <20230505155248.2261867-2-j.zink@pengutronix.de> (raw)
In-Reply-To: <20230505155248.2261867-1-j.zink@pengutronix.de>

Previously, whenever the usage was displayed, the imx-usb-loader exited
with error code.

When the usage is displayed due to invalid tool invocation, returning an
error code is valid behaviour, but when displaying the usage with the -h
command line option, success should be returned.

The other usage() callsite in the code already has an exit(1) following
it, which is why the exit call can be removed from the usage function
without introducing any behavioural change there.

Signed-off-by: Johannes Zink <j.zink@pengutronix.de>
---
Changelog:

 v1 -> v2: - fixed erronous commit subject
           - added comment in commit message why removing the exit()
	     call is from the usage() function is valid, even when not
	     explicitely adding an exit() call at all call sites

 scripts/imx/imx-usb-loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
index 41d57906c752..17b83b611765 100644
--- a/scripts/imx/imx-usb-loader.c
+++ b/scripts/imx/imx-usb-loader.c
@@ -1527,7 +1527,6 @@ static void usage(const char *prgname)
 		"-s           skip DCD included in image\n"
 		"-v           verbose (give multiple times to increase)\n"
 		"-h           this help\n", prgname);
-	exit(1);
 }
 
 int main(int argc, char *argv[])
@@ -1558,6 +1557,7 @@ int main(int argc, char *argv[])
 			break;
 		case 'h':
 			usage(argv[0]);
+			exit(0);
 		case 'd':
 			devtype = optarg;
 			break;
-- 
2.39.2




  reply	other threads:[~2023-05-05 15:54 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-05 15:52 [PATCH v2 0/3] Add displaying a version number in imx-usb-loader Johannes Zink
2023-05-05 15:52 ` Johannes Zink [this message]
2023-05-05 15:52 ` [PATCH v2 2/3] imx-usb-loader: use proper return code macros Johannes Zink
2023-05-05 15:52 ` [PATCH v2 3/3] imx-usb-loader: add commandline option for displaying version number Johannes Zink
2023-05-09  7:22 ` [PATCH v2 0/3] Add displaying a version number in imx-usb-loader Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230505155248.2261867-2-j.zink@pengutronix.de \
    --to=j.zink@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=patchwork-jzi@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox