From: Jonathan Dieter <jdieter@gmail.com>
Date: Wed, 25 Jul 2018 15:32:47 +0000 (+0100)
Subject: Remove "quiet" option as it no longer makes sense with new error reporting
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~174
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f2989aa8870acff63c12e6abe0ba65d4c01b12d1;p=zchunk.git

Remove "quiet" option as it no longer makes sense with new error reporting

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

diff --git a/src/zck.c b/src/zck.c
index faeee4f..bb954c6 100644
--- a/src/zck.c
+++ b/src/zck.c
@@ -45,7 +45,6 @@ static char args_doc[] = "<file>";
 static struct argp_option options[] = {
     {"verbose",      'v', 0,        0,
      "Increase verbosity (can be specified more than once for debugging)"},
-    {"quiet",        'q', 0,        0, "Only show errors"},
     {"split",        's', "STRING", 0, "Split chunks at beginning of STRING"},
     {"dict",         'D', "FILE",   0,
      "Set zstd compression dictionary to FILE"},
@@ -72,9 +71,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) {
             if(arguments->log_level < ZCK_LOG_DDEBUG)
                 arguments->log_level = ZCK_LOG_DDEBUG;
             break;
-        case 'q':
-            arguments->log_level = ZCK_LOG_ERROR;
-            break;
         case 's':
             arguments->split_string = arg;
             break;
@@ -116,7 +112,7 @@ int main (int argc, char *argv[]) {
     struct arguments arguments = {0};
 
     /* Defaults */
-    arguments.log_level = ZCK_LOG_WARNING;
+    arguments.log_level = ZCK_LOG_ERROR;
 
     argp_parse (&argp, argc, argv, 0, 0, &arguments);
 
@@ -166,7 +162,6 @@ int main (int argc, char *argv[]) {
         free(out_name);
         exit(1);
     }
-    free(out_name);
 
     zckCtx *zck = zck_create();
     if(zck == NULL) {
@@ -174,9 +169,10 @@ int main (int argc, char *argv[]) {
         exit(1);
     }
     if(!zck_init_write(zck, dst_fd)) {
-        printf("Unable to write to %s\n", out_name);
+        printf("Unable to write to %s: %s", out_name, zck_get_error(zck));
         exit(1);
     }
+    free(out_name);
 
     /*if(!zck_set_ioption(zck, ZCK_COMP_TYPE, ZCK_COMP_NONE)) {
         perror("Unable to set compression type\n");
diff --git a/src/zck_delta_size.c b/src/zck_delta_size.c
index 4f43871..ebf43e5 100644
--- a/src/zck_delta_size.c
+++ b/src/zck_delta_size.c
@@ -45,7 +45,6 @@ static char args_doc[] = "<file 1> <file 2>";
 static struct argp_option options[] = {
     {"verbose", 'v', 0,        0,
      "Increase verbosity (can be specified more than once for debugging)"},
-    {"quiet",   'q', 0,        0, "Only show errors"},
     {"version", 'V', 0,        0, "Show program version"},
     { 0 }
 };
@@ -64,9 +63,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) {
             if(arguments->log_level < ZCK_LOG_DDEBUG)
                 arguments->log_level = ZCK_LOG_DDEBUG;
             break;
-        case 'q':
-            arguments->log_level = ZCK_LOG_ERROR;
-            break;
         case 'V':
             version();
             break;
@@ -99,7 +95,7 @@ int main (int argc, char *argv[]) {
     struct arguments arguments = {0};
 
     /* Defaults */
-    arguments.log_level = ZCK_LOG_WARNING;
+    arguments.log_level = ZCK_LOG_ERROR;
 
     argp_parse (&argp, argc, argv, 0, 0, &arguments);
 
@@ -117,7 +113,8 @@ int main (int argc, char *argv[]) {
         exit(1);
     }
     if(!zck_init_read(zck_src, src_fd)) {
-        printf("Unable to read header from %s\n", arguments.args[0]);
+        printf("Error reading %s: %s", arguments.args[0],
+               zck_get_error(zck_src));
         exit(1);
     }
     close(src_fd);
@@ -134,7 +131,8 @@ int main (int argc, char *argv[]) {
         exit(1);
     }
     if(!zck_init_read(zck_tgt, tgt_fd)) {
-        printf("Unable to open %s\n", arguments.args[1]);
+        printf("Error reading %s: %s", arguments.args[1],
+               zck_get_error(zck_tgt));
         exit(1);
     }
     close(tgt_fd);