diff options
| author | Jani Nikula <jani@nikula.org> | 2017-10-07 11:44:04 +0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-10-09 22:24:02 -0300 |
| commit | 0f314c0c99befea599a68bea51d759b4133efef6 (patch) | |
| tree | 6d7fa97122e87bf6dcdb221267ac052f48331f59 /sprinter-json.c | |
| parent | 54aef071590cb23f61da943daa29080cf7446696 (diff) | |
cli: convert notmuch_bool_t to stdbool
C99 stdbool turned 18 this year. There really is no reason to use our
own, except in the library interface for backward
compatibility. Convert the cli and test binaries to stdbool.
Diffstat (limited to 'sprinter-json.c')
| -rw-r--r-- | sprinter-json.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sprinter-json.c b/sprinter-json.c index 0a077907..c6ec8577 100644 --- a/sprinter-json.c +++ b/sprinter-json.c @@ -13,14 +13,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 +37,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 +58,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; } @@ -132,7 +132,7 @@ json_integer (struct sprinter *sp, int 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); @@ -154,7 +154,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 @@ -167,7 +167,7 @@ json_separator (struct sprinter *sp) { struct sprinter_json *spj = (struct sprinter_json *) sp; - spj->insert_separator = TRUE; + spj->insert_separator = true; } struct sprinter * @@ -186,7 +186,7 @@ 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; |