From: Jason Self <j@jxself.org>
Date: Mon, 14 Sep 2015 03:28:42 +0000 (-0700)
Subject: TRYHELP_GOODBYE macro added.
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=a8a06bb53b71c2608d3e1e22181b0e9a6786b029;p=skeinsum.git

TRYHELP_GOODBYE macro added.
---

diff --git a/skein_cli.c b/skein_cli.c
index 82b2ae3..0ea815b 100644
--- a/skein_cli.c
+++ b/skein_cli.c
@@ -31,6 +31,8 @@ along with skeinsum. If not, see <http://www.gnu.org/licenses/>.
 #include <errno.h>
 #include "SHA3api_ref.h"
 
+#define TRYHELP_GOODBYE() do { printf("Try 'skein%dsum --help' for more information.\n", hashbitlen); exit(1); } while(0)
+
 extern const int hashbitlen;
 
 #define MaxNmberFiles 10
@@ -380,9 +382,7 @@ int main(int argc, char** argv)
 			case HELP_OPTION    : print_usage();   /* ..never returns */
 			case VERSION_OPTION : print_version(); /* ..never returns */
 
-			default:
-				printf("Try `skein%dsum --help' for more information.\n",hashbitlen);
-				exit(1);
+			default: TRYHELP_GOODBYE();
 		}
 	}
 
@@ -424,8 +424,7 @@ int main(int argc, char** argv)
 		if (check == 1 || quiet == 1 || warn == 1 || status == 1)
 		{
 			printf("skein%dsum: the --binary and --text options are meaningless when verifying checksums\n",hashbitlen);
-			printf("Try 'skein%dsum --help' for more information.\n",hashbitlen);
-			exit(0);
+			TRYHELP_GOODBYE();
 		}
 		if(number_files > 0)
 		{
@@ -464,8 +463,7 @@ int main(int argc, char** argv)
 		if (check == 1 || quiet == 1 || warn == 1 || status == 1)
 		{
 			printf("skein%dsum: the --binary and --text options are meaningless when verifying checksums\n",hashbitlen);
-			printf("Try 'skein%dsum --help' for more information.\n",hashbitlen);
-			exit(0);
+			TRYHELP_GOODBYE();
 		}
 		if(number_files > 0)
 		{
@@ -505,9 +503,7 @@ int main(int argc, char** argv)
 					printf("skein%dsum: the --status option is meaningful only when verifying checksums\n",hashbitlen);
 				if(warn == 1)
 					printf("skein%dsum: the --warn option is meaningful only when verifying checksums\n",hashbitlen);
-
-				printf("Try 'skein%dsum --help' for more information.\n",hashbitlen);
-				exit(1);
+				TRYHELP_GOODBYE();
 			}
 			if(number_files > 0)
 			{// hashing files
@@ -539,8 +535,7 @@ int main(int argc, char** argv)
 			if(tag == 1)
 			{
 				printf("skein%dsum: the --tag option is meaningless when verifying checksums\n",hashbitlen);
-				printf("Try 'skein%dsum --help' for more information\n",hashbitlen);
-				exit(1);
+				TRYHELP_GOODBYE();
 			}
 			int index_files = 0;
 			while(index_files < number_files)