[PATCH 03/11] Use empty strings instead of NULL in format_reply structure.

2011-05-25 Thread Jameson Graef Rollins 
This keeps things consistent with notmuch-show, and prevents having to
check for the existence of the field pointer for simple string output
formats.
---
 notmuch-reply.c |   12 ++--
 show-message.c  |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 8c5e76c..7959935 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 2ec9eca..32bb860 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));
-- 
1.7.4.4

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

[PATCH 03/11] Use empty strings instead of NULL in format_reply structure.

2011-05-25 Thread Jameson Graef Rollins 
This keeps things consistent with notmuch-show, and prevents having to
check for the existence of the field pointer for simple string output
formats.
---
 notmuch-reply.c |   12 ++--
 show-message.c  |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 8c5e76c..7959935 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 2ec9eca..32bb860 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));
-- 
1.7.4.4