debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 09:24:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli/dump: define GZPUTS and use it in notmuch-dump

Browse source 
Similarly to GZPRINTF, this is a drop in replacement that can be
improved where needd.
This commit is contained in:
David Bremner 2020-04-12 22:59:12 -03:00
parent 0d0918f604
commit 24ff33082a
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
notmuch-client.h
View file

@ -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"

10
notmuch-dump.c
View file

@ -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)) {