print_usage: merge printf calls and realign.

[skeinsum.git] / skein_cli.c

diff --git a/skein_cli.c b/skein_cli.c
index 63166f503ce762bc9edee940bca49d6e02399117..39e5ea03b2018c12f43f5b05892ea28af5b14d71 100644 (file)
--- a/skein_cli.c
+++ b/skein_cli.c
@@ -40,12 +40,11 @@ typedef long long unsigned LLU;
 extern const int hashbitlen;
 
 #define skeinVersion "1.3"
+
 const size_t input_minbufsize = 32 * 1024;
 const size_t input_maxbufsize = 32 * 1024 * 1024;
 
 
-char invalidOption = 0;
-
 enum
 {
   QUIET_OPTION = 11,
@@ -331,14 +330,16 @@ int VerifyHashesFromFile(FILE *fp, int status, int warn, int quiet)
                int hashVersion = decomposeHashLine(hash,MsgDigest_tmp,file_tmp);
                if (hashVersion == -1)
                {
-                       fprintf(stderr, "skein%d: %s is using newer version of skein%d algorithm\n",hashbitlen,file_tmp,hashbitlen);
-                       fprintf(stderr, "You should update your algorithm\n");
+                       WARN("%s is using newer version of skein%d algorithm\n"
+                            "You should update your algorithm\n",
+                            file_tmp, hashbitlen);
                        continue;
                }
                else if (hashVersion == 0)
                {
-                       fprintf(stderr, "skein%d: %s is using an older version of skein%d algorithm\n",hashbitlen,file_tmp,hashbitlen);
-                       fprintf(stderr, "You should use the older algorithm\n");
+                       WARN("%s is using an older version of skein%d algorithm\n"
+                            "You should use the older algorithm\n",
+                            file_tmp, hashbitlen);
                        continue;
                }
                else if (!isProper(MsgDigest_tmp))
@@ -379,27 +380,27 @@ void print_usage(void)
 {
        printf("Usage: skein%dsum [OPTION]... [FILE]...\n",hashbitlen);
        printf("Print or check skein (%d-bit) checksums.\n",hashbitlen);
-       printf("With no FILE, or when FILE is -, read standard input.\n");
-       printf("\n");
-       printf("-b, --binary         read in binary mode\n");
-       printf("-c, --check          read skein sums from the FILEs and check them\n");
-       printf("--tag            create a BSD-style checksum\n");
-       printf("-t, --text           read in text mode (default)\n");
-       printf("\n");
-       printf("The following three options are useful only when verifying checksums:\n");
-       printf("--quiet          don't print OK for each successfully verified file\n");
-       printf("--status         don't output anything, status code shows success\n");
-       printf("-w, --warn           warn about improperly formatted checksum lines\n");
-       printf("\n");
-       printf("--strict         with --check, exit non-zero for any invalid input\n");
-       printf("--help     display this help and exit\n");
-       printf("--version  output version information and exit\n");
-       printf("\n");
-       printf("The sums are computed as described in version 1.3 of the Skein\n");
-       printf("specification. When checking, the input should be a former output of\n");
-       printf("this program. The default mode is to print a line with checksum, a\n");
-       printf("character indicating input mode ('*' for binary, space for text), and\n");
-       printf("name for each FILE.\n");
+       printf("With no FILE, or when FILE is -, read standard input.\n"
+              "\n"
+              "-b, --binary     read in binary mode\n"
+              "-c, --check      read skein sums from the FILEs and check them\n"
+              "--tag            create a BSD-style checksum\n"
+              "-t, --text       read in text mode (default)\n"
+              "\n"
+              "The following three options are useful only when verifying checksums:\n"
+              "--quiet          don't print OK for each successfully verified file\n"
+              "--status         don't output anything, status code shows success\n"
+              "-w, --warn       warn about improperly formatted checksum lines\n"
+              "\n"
+              "--strict         with --check, exit non-zero for any invalid input\n"
+              "-h, --help       display this help and exit\n"
+              "-V, --version    output version information and exit\n"
+              "\n"
+              "The sums are computed as described in version 1.3 of the Skein\n"
+              "specification. When checking, the input should be a former output of\n"
+              "this program. The default mode is to print a line with checksum, a\n"
+              "character indicating input mode ('*' for binary, space for text), and\n"
+              "name for each FILE.\n");
        exit(1);
 }