From ea1fa3450f43a8e7c52e8de641aeaf6d0e26ae0c Mon Sep 17 00:00:00 2001
From: dragonmux <git@dragonmux.network>
Date: Sun, 7 Jan 2024 21:35:55 +0000
Subject: [PATCH] bmpflash: The help and version options no longer need the
 explicit either-or check

---
 src/bmpflash.cxx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/bmpflash.cxx b/src/bmpflash.cxx
index cfc41de..96bb4e1 100644
--- a/src/bmpflash.cxx
+++ b/src/bmpflash.cxx
@@ -60,14 +60,7 @@ int main(const int argCount, const char *const *const argList)
 	console.showDebug(verbosity & 1U);
 
 	// Handle the version and help options first
-	const auto *const version{args["version"sv]};
-	const auto *const help{args["help"sv]};
-	if (version && help)
-	{
-		console.error("Can only specify one of --help and --version, not both."sv);
-		return 1;
-	}
-	if (version)
+	if (args["version"sv])
 	{
 		bmpflash::displayVersion();
 		const auto *const libusbVersion{libusb_get_version()};
@@ -76,7 +69,7 @@ int main(const int argCount, const char *const *const argList)
 		return 0;
 	}
 	// Display the help if requested or there were no command line options given
-	if (help || args.count() == 0U)
+	if (args["help"sv] || args.count() == 0U)
 	{
 		bmpflash::programOptions.displayHelp(args);
 		return 0;