From: david Date: Thu, 15 Nov 2012 01:33:21 +0000 (+2000) Subject: [PATCH 2/3] notmuch-restore: tidy formatting X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=07d85086e4132171808b17a225adab463a82852b;p=notmuch-archives.git [PATCH 2/3] notmuch-restore: tidy formatting --- diff --git a/8b/a7a870fbff020cd8812167d603d8ddf445794f b/8b/a7a870fbff020cd8812167d603d8ddf445794f new file mode 100644 index 000000000..adb3a910c --- /dev/null +++ b/8b/a7a870fbff020cd8812167d603d8ddf445794f @@ -0,0 +1,134 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id BFB54431FC0 + for ; Wed, 14 Nov 2012 17:33:43 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id OV2uaaXOdSAC for ; + Wed, 14 Nov 2012 17:33:41 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C1695431FD8 + for ; Wed, 14 Nov 2012 17:33:41 -0800 (PST) +Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.89.108] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) + (envelope-from ) + id 1TYoKr-0007Yb-10; Wed, 14 Nov 2012 21:33:41 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TYoKl-0000U9-G8; Wed, 14 Nov 2012 21:33:35 -0400 +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> +X-Mailer: git-send-email 1.7.10.4 +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 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 15 Nov 2012 01:33:44 -0000 + +From: David Bremner + +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 (®ex, + "^([^ ]+) \\(([^)]*)\\)$", + 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 (®ex, 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 +