From: Jameson Graef Rollins Date: Thu, 26 May 2011 01:01:12 +0000 (-0700) Subject: Use empty strings instead of NULL in format_reply structure. X-Git-Tag: debian/0.6_254~101 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=757e06f74bb7b5f69c0a20c7a5432150e074055d 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. --- 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));