aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jameson Graef Rollins <jrollins@finestructure.net>2011-05-25 18:01:12 -0700
committerGravatar Carl Worth <cworth@cworth.org>2011-05-27 16:18:57 -0700
commit757e06f74bb7b5f69c0a20c7a5432150e074055d (patch)
treeb3061dd1e44d1b1d74d75e02ebafd24e0701ce53
parent5659d422315ebd46f80db739e28a58b51590b64f (diff)
Use empty strings instead of NULL in format_reply structure.
This keeps things consistent with notmuch-show, and prevents having to check for the existence of the field pointer for simple string output formats.
-rw-r--r--notmuch-reply.c12
-rw-r--r--show-message.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/notmuch-reply.c b/notmuch-reply.c
index 8c5e76cc..79599358 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -29,12 +29,12 @@ reply_part (GMimeObject *part,
unused (int *part_count));
static const notmuch_show_format_t format_reply = {
- NULL,
- NULL, NULL,
- NULL, NULL, NULL,
- NULL, reply_part, NULL, NULL, NULL,
- NULL, NULL,
- NULL
+ "",
+ "", NULL,
+ "", NULL, "",
+ "", reply_part, NULL, "", "",
+ "", "",
+ ""
};
static void
diff --git a/show-message.c b/show-message.c
index 2ec9eca9..32bb860f 100644
--- a/show-message.c
+++ b/show-message.c
@@ -46,7 +46,7 @@ show_message_part (GMimeObject *part,
selected = (params->part <= 0 || state->part_count == params->part);
if (selected || state->in_zone) {
- if (!first && (params->part <= 0 || state->in_zone) && format->part_sep)
+ if (!first && (params->part <= 0 || state->in_zone))
fputs (format->part_sep, stdout);
format->part (part, &(state->part_count));