show: Remove now unused fields from notmuch_show_format

The message_set_{begin,sep,end} and null_message fields are no longer
used because we now use the structure printer provided by the format.

diff --git a/notmuch-client.h b/notmuch-client.h
index b11caff875985ba9e876387ce8f7db0110683f04..ae9344b2ae332cd6e7025710bb292bff73846865 100644 (file)
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -71,13 +71,9 @@ struct notmuch_show_params;
 
 typedef struct notmuch_show_format {
     struct sprinter *(*new_sprinter) (const void *ctx, FILE *stream);
 
 typedef struct notmuch_show_format {
     struct sprinter *(*new_sprinter) (const void *ctx, FILE *stream);

-    const char *message_set_start;

     notmuch_status_t (*part) (const void *ctx, struct sprinter *sprinter,
                              struct mime_node *node, int indent,
                              const struct notmuch_show_params *params);
     notmuch_status_t (*part) (const void *ctx, struct sprinter *sprinter,
                              struct mime_node *node, int indent,
                              const struct notmuch_show_params *params);

-    const char *message_set_sep;
-    const char *message_set_end;
-    const char *null_message;

 } notmuch_show_format_t;
 
 typedef struct notmuch_crypto {
 } notmuch_show_format_t;
 
 typedef struct notmuch_crypto {

diff --git a/notmuch-show.c b/notmuch-show.c
index 89bf2e7681fd6f66a6c05cc03e1746e3d29f831f..355629348c5977bd5665c1a8ff76cbe7ddc1ef28 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -37,11 +37,7 @@ format_part_json_entry (const void *ctx, sprinter_t *sp, mime_node_t *node,
 
 static const notmuch_show_format_t format_json = {
     .new_sprinter = sprinter_json_create,
 
 static const notmuch_show_format_t format_json = {
     .new_sprinter = sprinter_json_create,

-    .message_set_start = "[",

     .part = format_part_json_entry,
     .part = format_part_json_entry,

-    .message_set_sep = ", ",
-    .message_set_end = "]",
-    .null_message = "null"

 };
 
 static notmuch_status_t
 };
 
 static notmuch_status_t