Re: [PATCH 3/5] cli/dump: define GZPRINTF macro and use it in place of gzprintf

[David Bremner]

David Bremner  writes:

> Tomi Ollila  writes:
>
>> __location__ ?? never seen such a (preprocessor?) definition. could not
>> find any reference by search...
>
> I have to admit, it's just cargo culted from util/error_util.h
>
OIC, it's defined in talloc.h. Probably that deserves a comment.
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 3/5] cli/dump: define GZPRINTF macro and use it in place of gzprintf

[David Bremner]

Tomi Ollila  writes:

> __location__ ?? never seen such a (preprocessor?) definition. could not
> find any reference by search...

I have to admit, it's just cargo culted from util/error_util.h

>
> there are also some suspiciously looking like inconsistent spaces in that
> macro above

OK, I'll have a look, thanks.

>
> rest of the series (before and after) look good 
>
> Tomi
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 3/5] cli/dump: define GZPRINTF macro and use it in place of gzprintf

[Tomi Ollila]

On Sun, Apr 12 2020, David Bremner wrote:

> This will at least catch errors, and can be replaced with more
> sophisticated error handling where appropriate.
> ---
>  notmuch-client.h |  3 +++
>  notmuch-dump.c   | 24 
>  2 files changed, 15 insertions(+), 12 deletions(-)
>
> diff --git a/notmuch-client.h b/notmuch-client.h
> index 467e1d84..55d4d526 100644
> --- a/notmuch-client.h
> +++ b/notmuch-client.h
> @@ -497,6 +497,9 @@ print_status_gzbytes (const char *loc,
> gzFile file,
> int bytes);
>  
> +#define ASSERT_GZBYTES(file, bytes) ( (print_status_gzbytes(__location__, 
> file, bytes)) ?  exit(1) : 0 )

__location__ ?? never seen such a (preprocessor?) definition. could not
find any reference by search...

there are also some suspiciously looking like inconsistent spaces in that
macro above

rest of the series (before and after) look good 

Tomi

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 3/5] cli/dump: define GZPRINTF macro and use it in place of gzprintf

[David Bremner]

This will at least catch errors, and can be replaced with more
sophisticated error handling where appropriate.
---
 notmuch-client.h |  3 +++
 notmuch-dump.c   | 24 
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/notmuch-client.h b/notmuch-client.h
index 467e1d84..55d4d526 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -497,6 +497,9 @@ print_status_gzbytes (const char *loc,
  gzFile file,
  int bytes);
 
+#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__));
+
 #include "command-line-arguments.h"
 
 extern const char *notmuch_requested_db_uuid;
diff --git a/notmuch-dump.c b/notmuch-dump.c
index 65e02639..ca45d885 100644
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -42,7 +42,7 @@ database_dump_config (notmuch_database_t *notmuch, gzFile 
output)
 notmuch_config_list_key (list));
goto DONE;
}
-   gzprintf (output, "#@ %s", buffer);
+   GZPRINTF (output, "#@ %s", buffer);
 
if (hex_encode (notmuch, notmuch_config_list_value (list),
, _size) != HEX_SUCCESS) {
@@ -51,7 +51,7 @@ database_dump_config (notmuch_database_t *notmuch, gzFile 
output)
goto DONE;
}
 
-   gzprintf (output, " %s\n", buffer);
+   GZPRINTF (output, " %s\n", buffer);
 }
 
 ret = EXIT_SUCCESS;
@@ -71,7 +71,7 @@ print_dump_header (gzFile output, int output_format, int 
include)
 {
 const char *sep = "";
 
-gzprintf (output, "#notmuch-dump %s:%d ",
+GZPRINTF (output, "#notmuch-dump %s:%d ",
  (output_format == DUMP_FORMAT_SUP) ? "sup" : "batch-tag",
  NOTMUCH_DUMP_VERSION);
 
@@ -80,11 +80,11 @@ print_dump_header (gzFile output, int output_format, int 
include)
sep = ",";
 }
 if (include & DUMP_INCLUDE_PROPERTIES) {
-   gzprintf (output, "%sproperties", sep);
+   GZPRINTF (output, "%sproperties", sep);
sep = ",";
 }
 if (include & DUMP_INCLUDE_TAGS) {
-   gzprintf (output, "%stags", sep);
+   GZPRINTF (output, "%stags", sep);
 }
 gzputs (output, "\n");
 }
@@ -115,7 +115,7 @@ dump_properties_message (void *ctx,
fprintf (stderr, "Error: failed to hex-encode message-id %s\n", 
message_id);
return 1;
}
-   gzprintf (output, "#= %s", *buffer_p);
+   GZPRINTF (output, "#= %s", *buffer_p);
first = false;
}
 
@@ -126,18 +126,18 @@ dump_properties_message (void *ctx,
fprintf (stderr, "Error: failed to hex-encode key %s\n", key);
return 1;
}
-   gzprintf (output, " %s", *buffer_p);
+   GZPRINTF (output, " %s", *buffer_p);
 
if (hex_encode (ctx, val, buffer_p, size_p) != HEX_SUCCESS) {
fprintf (stderr, "Error: failed to hex-encode value %s\n", val);
return 1;
}
-   gzprintf (output, "=%s", *buffer_p);
+   GZPRINTF (output, "=%s", *buffer_p);
 }
 notmuch_message_properties_destroy (list);
 
 if (! first)
-   gzprintf (output, "\n", *buffer_p);
+   GZPRINTF (output, "\n", *buffer_p);
 
 return 0;
 }
@@ -165,7 +165,7 @@ dump_tags_message (void *ctx,
 }
 
 if (output_format == DUMP_FORMAT_SUP) {
-   gzprintf (output, "%s (", message_id);
+   GZPRINTF (output, "%s (", message_id);
 }
 
 for (notmuch_tags_t *tags = notmuch_message_get_tags (message);
@@ -187,7 +187,7 @@ dump_tags_message (void *ctx,
 tag_str);
return EXIT_FAILURE;
}
-   gzprintf (output, "+%s", *buffer_p);
+   GZPRINTF (output, "+%s", *buffer_p);
}
 }
 
@@ -200,7 +200,7 @@ dump_tags_message (void *ctx,
 message_id, strerror (errno));
return EXIT_FAILURE;
}
-   gzprintf (output, " -- %s\n", *buffer_p);
+   GZPRINTF (output, " -- %s\n", *buffer_p);
 }
 return EXIT_SUCCESS;
 }
-- 
2.25.1

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch