From 9c4efa8487d292268d9ae6a089b1063c6e82e6e4 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 26 Oct 2009 22:19:08 -0700 Subject: [PATCH] notmuch restore: Don't bother printing tag values. The code was just a little messy here with three parallel conditions testing for message == NULL. --- notmuch.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/notmuch.c b/notmuch.c index f620f58d..3b0182a9 100644 --- a/notmuch.c +++ b/notmuch.c @@ -849,8 +849,9 @@ restore_command (int argc, char *argv[]) message = notmuch_database_find_message (notmuch, message_id); if (message == NULL) { - fprintf (stderr, "Warning: Cannot apply tags to missing message: %s (", + fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n", message_id); + goto NEXT_LINE; } next = tags; @@ -858,26 +859,19 @@ restore_command (int argc, char *argv[]) tag = strsep (&next, " "); if (*tag == '\0') continue; - if (message) { - status = notmuch_message_add_tag (message, tag); - if (status) { - fprintf (stderr, - "Error applying tag %s to message %s:\n", - tag, message_id); - fprintf (stderr, "%s\n", - notmuch_status_to_string (status)); - } - } else { - fprintf (stderr, "%s%s", - tag == tags ? "" : " ", tag); + status = notmuch_message_add_tag (message, tag); + if (status) { + fprintf (stderr, + "Error applying tag %s to message %s:\n", + tag, message_id); + fprintf (stderr, "%s\n", + notmuch_status_to_string (status)); } } - if (message) - notmuch_message_destroy (message); - else - fprintf (stderr, ")\n"); + notmuch_message_destroy (message); } + NEXT_LINE: free (message_id); free (tags); } -- 2.26.2