diff options
| author | David Bremner <david@tethera.net> | 2020-04-12 22:59:12 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-04-13 17:14:50 -0300 |
| commit | 24ff33082ab1a35c7a31835fba80ade145596422 (patch) | |
| tree | 124e3dd0576843280621a1eb8364d814fcd5e991 | |
| parent | 0d0918f604c5da419c08e3bfae005a4820395997 (diff) | |
cli/dump: define GZPUTS and use it in notmuch-dump
Similarly to GZPRINTF, this is a drop in replacement that can be
improved where needd.
| -rw-r--r-- | notmuch-client.h | 1 | ||||
| -rw-r--r-- | notmuch-dump.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/notmuch-client.h b/notmuch-client.h index 6cb81820..ebd43e8d 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -500,6 +500,7 @@ print_status_gzbytes (const char *loc, /* the __location__ macro is defined in talloc.h */ #define ASSERT_GZBYTES(file, bytes) ((print_status_gzbytes (__location__, file, bytes)) ? exit (1) : 0) #define GZPRINTF(file, fmt, ...) ASSERT_GZBYTES (file, gzprintf (file, fmt, ##__VA_ARGS__)); +#define GZPUTS(file, str) ASSERT_GZBYTES(file, gzputs (file, str)); #include "command-line-arguments.h" diff --git a/notmuch-dump.c b/notmuch-dump.c index 6c5c1433..52a88283 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -76,7 +76,7 @@ print_dump_header (gzFile output, int output_format, int include) NOTMUCH_DUMP_VERSION); if (include & DUMP_INCLUDE_CONFIG) { - gzputs (output, "config"); + GZPUTS (output, "config"); sep = ","; } if (include & DUMP_INCLUDE_PROPERTIES) { @@ -86,7 +86,7 @@ print_dump_header (gzFile output, int output_format, int include) if (include & DUMP_INCLUDE_TAGS) { GZPRINTF (output, "%stags", sep); } - gzputs (output, "\n"); + GZPUTS (output, "\n"); } static int @@ -174,12 +174,12 @@ dump_tags_message (void *ctx, const char *tag_str = notmuch_tags_get (tags); if (! first) - gzputs (output, " "); + GZPUTS (output, " "); first = 0; if (output_format == DUMP_FORMAT_SUP) { - gzputs (output, tag_str); + GZPUTS (output, tag_str); } else { if (hex_encode (ctx, tag_str, buffer_p, size_p) != HEX_SUCCESS) { @@ -192,7 +192,7 @@ dump_tags_message (void *ctx, } if (output_format == DUMP_FORMAT_SUP) { - gzputs (output, ")\n"); + GZPUTS (output, ")\n"); } else { if (make_boolean_term (ctx, "id", message_id, buffer_p, size_p)) { |