util: Fix two corner-cases in boolean term quoting function

[notmuch] / notmuch-dump.c

diff --git a/notmuch-dump.c b/notmuch-dump.c
index a3244e0a417e093945113154bf5d213a9eb87633..158142f55b4992c53de1396e7e557536b9074ec8 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -23,9 +23,8 @@
 #include "string-util.h"
 
 int
-notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
+notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[])
 {
-    notmuch_config_t *config;
     notmuch_database_t *notmuch;
     notmuch_query_t *query;
     FILE *output = stdout;
@@ -34,18 +33,14 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
     notmuch_tags_t *tags;
     const char *query_str = "";
 
-    config = notmuch_config_open (ctx, NULL, NULL);
-    if (config == NULL)
-       return 1;
-
     if (notmuch_database_open (notmuch_config_get_database_path (config),
                               NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))
-       return 1;
+       return EXIT_FAILURE;
 
     char *output_file_name = NULL;
     int opt_index;
 
-    int output_format = DUMP_FORMAT_SUP;
+    int output_format = DUMP_FORMAT_BATCH_TAG;
 
     notmuch_opt_desc_t options[] = {
        { NOTMUCH_OPT_KEYWORD, &output_format, "format", 'f',
@@ -57,18 +52,15 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
     };
 
     opt_index = parse_arguments (argc, argv, options, 1);
-
-    if (opt_index < 0) {
-       /* diagnostics already printed */
-       return 1;
-    }
+    if (opt_index < 0)
+       return EXIT_FAILURE;
 
     if (output_file_name) {
        output = fopen (output_file_name, "w");
        if (output == NULL) {
            fprintf (stderr, "Error opening %s for writing: %s\n",
                     output_file_name, strerror (errno));
-           return 1;
+           return EXIT_FAILURE;
        }
     }
 
@@ -77,14 +69,14 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
        query_str = query_string_from_args (notmuch, argc - opt_index, argv + opt_index);
        if (query_str == NULL) {
            fprintf (stderr, "Out of memory.\n");
-           return 1;
+           return EXIT_FAILURE;
        }
     }
 
     query = notmuch_query_create (notmuch, query_str);
     if (query == NULL) {
        fprintf (stderr, "Out of memory\n");
-       return 1;
+       return EXIT_FAILURE;
     }
     /* Don't ask xapian to sort by Message-ID. Xapian optimizes returning the
      * first results quickly at the expense of total time.
@@ -136,7 +128,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
                                &buffer, &buffer_size) != HEX_SUCCESS) {
                    fprintf (stderr, "Error: failed to hex-encode tag %s\n",
                             tag_str);
-                   return 1;
+                   return EXIT_FAILURE;
                }
                fprintf (output, "+%s", buffer);
            }
@@ -149,7 +141,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
                                   &buffer, &buffer_size)) {
                    fprintf (stderr, "Error quoting message id %s: %s\n",
                             message_id, strerror (errno));
-                   return 1;
+                   return EXIT_FAILURE;
            }
            fprintf (output, " -- %s\n", buffer);
        }
@@ -163,5 +155,5 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
     notmuch_query_destroy (query);
     notmuch_database_destroy (notmuch);
 
-    return 0;
+    return EXIT_SUCCESS;
 }