From: david@tethera.net
To: notmuch@notmuchmail.org
Subject: [PATCH 2/3] notmuch-restore: tidy formatting
Date: Wed, 14 Nov 2012 21:33:21 -0400
Message-Id: <1352943202-1431-3-git-send-email-david@tethera.net>
In-Reply-To: <1352943202-1431-1-git-send-email-david@tethera.net>
References: <1352943202-1431-1-git-send-email-david@tethera.net>
X-Spam_bar: -
Cc: David Bremner <bremner@debian.org>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 01:33:44 -0000

From: David Bremner <bremner@debian.org>

This is again the work of uncrustify.

I remember there is some controversy about "! foo" versus "!foo", but
in context I think "! foo" looks OK. Also, for functions "! foo
(blah)" seems better than "!foo (blah)".
---
 notmuch-restore.c |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/notmuch-restore.c b/notmuch-restore.c
index 7d8f44c..f03dcac 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -38,13 +38,13 @@ tag_message (notmuch_database_t *notmuch, const char *message_id,
 	fprintf (stderr, "Warning: Cannot apply tags to %smessage: %s\n",
 		 message ? "" : "missing ", message_id);
 	if (status)
-	    fprintf (stderr, "%s\n", notmuch_status_to_string(status));
+	    fprintf (stderr, "%s\n", notmuch_status_to_string (status));
 	return 1;
     }
 
     /* In order to detect missing messages, this check/optimization is
      * intentionally done *after* first finding the message. */
-    if (!remove_all && (file_tags == NULL || *file_tags == '\0'))
+    if (! remove_all && (file_tags == NULL || *file_tags == '\0'))
 	goto DONE;
 
     db_tags_str = NULL;
@@ -88,7 +88,7 @@ tag_message (notmuch_database_t *notmuch, const char *message_id,
     if (synchronize_flags)
 	notmuch_message_tags_to_maildir_flags (message);
 
-DONE:
+  DONE:
     if (message)
 	notmuch_message_destroy (message);
 
@@ -145,7 +145,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
 
     if (opt_index < argc) {
 	fprintf (stderr,
-	 "Unused positional parameter: %s\n",
+		 "Unused positional parameter: %s\n",
 		 argv[opt_index]);
 	return 1;
     }
@@ -157,7 +157,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
     if ( xregcomp (&regex,
 		   "^([^ ]+) \\(([^)]*)\\)$",
 		   REG_EXTENDED) )
-	INTERNAL_ERROR("compile time constant regex failed.");
+	INTERNAL_ERROR ("compile time constant regex failed.");
 
     while ((line_len = getline (&line, &line_size, input)) != -1) {
 	regmatch_t match[3];
@@ -166,8 +166,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
 	chomp_newline (line);
 
 	rerr = xregexec (&regex, line, 3, match, 0);
-	if (rerr == REG_NOMATCH)
-	{
+	if (rerr == REG_NOMATCH) {
 	    fprintf (stderr, "Warning: Ignoring invalid input line: %s\n",
 		     line);
 	    continue;
@@ -178,7 +177,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
 	file_tags = xstrndup (line + match[2].rm_so,
 			      match[2].rm_eo - match[2].rm_so);
 
-	tag_message (notmuch, message_id, file_tags, !accumulate,
+	tag_message (notmuch, message_id, file_tags, ! accumulate,
 		     synchronize_flags);
 
 	free (message_id);
-- 
1.7.10.4