emacs: Add new option notmuch-search-hide-excluded

[notmuch] / sprinter-json.c

diff --git a/sprinter-json.c b/sprinter-json.c
index c9b683530b08cb97d0d4689efe7d0a3fff1b5e84..502f89fbb70ef8424543009278dc9d8c23b17f74 100644 (file)
--- a/sprinter-json.c
+++ b/sprinter-json.c
@@ -1,3 +1,4 @@
+#include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <talloc.h>
@@ -13,14 +14,14 @@ struct sprinter_json {
     /* A flag to signify that a separator should be inserted in the
      * output as soon as possible.
      */
-    notmuch_bool_t insert_separator;
+    bool insert_separator;
 };
 
 struct json_state {
     struct json_state *parent;
     /* True if nothing has been printed in this aggregate yet.
      * Suppresses the comma before a value. */
-    notmuch_bool_t first;
+    bool first;
     /* The character that closes the current aggregate. */
     char close;
 };
@@ -37,12 +38,12 @@ json_begin_value (struct sprinter *sp)
            fputc (',', spj->stream);
            if (spj->insert_separator) {
                fputc ('\n', spj->stream);
-               spj->insert_separator = FALSE;
+               spj->insert_separator = false;
            } else {
                fputc (' ', spj->stream);
            }
        } else {
-           spj->state->first = FALSE;
+           spj->state->first = false;
        }
     }
     return spj;
@@ -58,7 +59,7 @@ json_begin_aggregate (struct sprinter *sp, char open, char close)
 
     fputc (open, spj->stream);
     state->parent = spj->state;
-    state->first = TRUE;
+    state->first = true;
     state->close = close;
     spj->state = state;
 }
@@ -118,19 +119,21 @@ json_string_len (struct sprinter *sp, const char *val, size_t len)
 static void
 json_string (struct sprinter *sp, const char *val)
 {
+    if (val == NULL)
+       val = "";
     json_string_len (sp, val, strlen (val));
 }
 
 static void
-json_integer (struct sprinter *sp, int val)
+json_integer (struct sprinter *sp, int64_t val)
 {
     struct sprinter_json *spj = json_begin_value (sp);
 
-    fprintf (spj->stream, "%d", val);
+    fprintf (spj->stream, "%" PRId64, val);
 }
 
 static void
-json_boolean (struct sprinter *sp, notmuch_bool_t val)
+json_boolean (struct sprinter *sp, bool val)
 {
     struct sprinter_json *spj = json_begin_value (sp);
 
@@ -152,7 +155,7 @@ json_map_key (struct sprinter *sp, const char *key)
 
     json_string (sp, key);
     fputs (": ", spj->stream);
-    spj->state->first = TRUE;
+    spj->state->first = true;
 }
 
 static void
@@ -165,11 +168,11 @@ json_separator (struct sprinter *sp)
 {
     struct sprinter_json *spj = (struct sprinter_json *) sp;
 
-    spj->insert_separator = TRUE;
+    spj->insert_separator = true;
 }
 
 struct sprinter *
-sprinter_json_create (const void *ctx, FILE *stream)
+sprinter_json_create (notmuch_database_t *db, FILE *stream)
 {
     static const struct sprinter_json template = {
        .vtable = {
@@ -184,16 +187,17 @@ sprinter_json_create (const void *ctx, FILE *stream)
            .map_key = json_map_key,
            .separator = json_separator,
            .set_prefix = json_set_prefix,
-           .is_text_printer = FALSE,
+           .is_text_printer = false,
        }
     };
     struct sprinter_json *res;
 
-    res = talloc (ctx, struct sprinter_json);
+    res = talloc (db, struct sprinter_json);
     if (! res)
        return NULL;
 
     *res = template;
+    res->vtable.notmuch = db;
     res->stream = stream;
     return &res->vtable;
 }