--- /dev/null
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id E3B486DE0188\r
+ for <notmuch@notmuchmail.org>; Sat, 28 May 2016 10:45:58 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.009\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.009 tagged_above=-999 required=5\r
+ tests=[HEADER_FROM_DIFFERENT_DOMAINS=0.001, T_RP_MATCHES_RCVD=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 1xNKKTQz1pQu for <notmuch@notmuchmail.org>;\r
+ Sat, 28 May 2016 10:45:49 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id F0F4D6DE00CE\r
+ for <notmuch@notmuchmail.org>; Sat, 28 May 2016 10:45:48 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id ECA361000B3; Sat, 28 May 2016 20:45:32 +0300 (EEST)\r
+From: Tomi Ollila <too@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Cc: tomi.ollila@iki.fi\r
+Subject: [PATCH] lib: whitespace cleanup\r
+Date: Sat, 28 May 2016 20:45:31 +0300\r
+Message-Id: <1464457531-956-1-git-send-email-too@iki.fi>\r
+X-Mailer: git-send-email 2.8.2\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 28 May 2016 17:45:59 -0000\r
+\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+\r
+Cleaned the following whitespace in lib/* files:\r
+\r
+lib/index.cc: 1 line: trailing whitespace\r
+lib/database.cc 5 lines: 8 spaces at the beginning of line\r
+lib/notmuch-private.h: 4 lines: 8 spaces at the beginning of line\r
+lib/message.cc: 1 line: trailing whitespace\r
+lib/sha1.c: 1 line: empty lines at the end of file\r
+lib/query.cc: 2 lines: 8 spaces at the beginning of line\r
+lib/gen-version-script.sh: 1 line: trailing whitespace\r
+---\r
+\r
+Cleaned lib as it was easiest to compare these doesn't collide\r
+with any patches in review queue. There are plenty of more to\r
+be cleaned up, perhaps later...\r
+\r
+ lib/database.cc | 10 +++++-----\r
+ lib/gen-version-script.sh | 2 +-\r
+ lib/index.cc | 2 +-\r
+ lib/message.cc | 2 +-\r
+ lib/notmuch-private.h | 8 ++++----\r
+ lib/query.cc | 4 ++--\r
+ lib/sha1.c | 1 -\r
+ 7 files changed, 14 insertions(+), 15 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 96300008765e..0b6041022613 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -2177,8 +2177,8 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,\r
+ * References header, if available. If not, fall back to the\r
+ * first message ID in the In-Reply-To header. */\r
+ if (last_ref_message_id) {\r
+- _notmuch_message_add_term (message, "replyto",\r
+- last_ref_message_id);\r
++ _notmuch_message_add_term (message, "replyto",\r
++ last_ref_message_id);\r
+ } else if (in_reply_to_message_id) {\r
+ _notmuch_message_add_term (message, "replyto",\r
+ in_reply_to_message_id);\r
+@@ -2287,15 +2287,15 @@ _consume_metadata_thread_id (void *ctx, notmuch_database_t *notmuch,\r
+ if (stored_id.empty ()) {\r
+ return NULL;\r
+ } else {\r
+- Xapian::WritableDatabase *db;\r
++ Xapian::WritableDatabase *db;\r
+ \r
+ db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);\r
+ \r
+ /* Clear the metadata for this message ID. We don't need it\r
+ * anymore. */\r
+- db->set_metadata (metadata_key, "");\r
++ db->set_metadata (metadata_key, "");\r
+ \r
+- return talloc_strdup (ctx, stored_id.c_str ());\r
++ return talloc_strdup (ctx, stored_id.c_str ());\r
+ }\r
+ }\r
+ \r
+diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh\r
+index 847700114ef8..0f908093dc5e 100644\r
+--- a/lib/gen-version-script.sh\r
++++ b/lib/gen-version-script.sh\r
+@@ -17,7 +17,7 @@ nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $3 ~ "Xapian.*Error" {print $3\r
+ while read sym; do\r
+ demangled=$(c++filt $sym)\r
+ case $demangled in\r
+- typeinfo*) \r
++ typeinfo*)\r
+ printf "\t$sym;\n"\r
+ ;;\r
+ *)\r
+diff --git a/lib/index.cc b/lib/index.cc\r
+index f166aefd2fc1..8aa844e4161d 100644\r
+--- a/lib/index.cc\r
++++ b/lib/index.cc\r
+@@ -144,7 +144,7 @@ filter_filter (GMimeFilter *gmime_filter, char *inbuf, size_t inlen, size_t pres\r
+ {9, ' ', ' ', 10, 0},\r
+ {10, '\n', '\n', 11, 10},\r
+ {11, 'M', 'M', 12, 0},\r
+- {12, ' ', '`', 12, 11} \r
++ {12, ' ', '`', 12, 11}\r
+ };\r
+ int next;\r
+ \r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 68393055b3eb..022268796fc7 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -1444,7 +1444,7 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)\r
+ \r
+ for (i = 0; i < ARRAY_SIZE(flag2tag); i++) {\r
+ if ((strchr (combined_flags, flag2tag[i].flag) != NULL)\r
+- ^ \r
++ ^\r
+ flag2tag[i].inverse)\r
+ {\r
+ status = notmuch_message_add_tag (message, flag2tag[i].tag);\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index 92807975bb94..6063262a1e3a 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -158,8 +158,8 @@ typedef enum _notmuch_private_status {\r
+ ((private_status >= (notmuch_private_status_t) NOTMUCH_STATUS_LAST_STATUS)\\r
+ ? \\r
+ _internal_error (format " (%s).\n", \\r
+- ##__VA_ARGS__, \\r
+- __location__), \\r
++ ##__VA_ARGS__, \\r
++ __location__), \\r
+ (notmuch_status_t) NOTMUCH_PRIVATE_STATUS_SUCCESS \\r
+ : \\r
+ (notmuch_status_t) private_status)\r
+@@ -477,11 +477,11 @@ _notmuch_mset_messages_move_to_next (notmuch_messages_t *messages);\r
+ \r
+ notmuch_bool_t\r
+ _notmuch_doc_id_set_contains (notmuch_doc_id_set_t *doc_ids,\r
+- unsigned int doc_id);\r
++ unsigned int doc_id);\r
+ \r
+ void\r
+ _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,\r
+- unsigned int doc_id);\r
++ unsigned int doc_id);\r
+ \r
+ /* querying xapian documents by type (e.g. "mail" or "ghost"): */\r
+ notmuch_status_t\r
+diff --git a/lib/query.cc b/lib/query.cc\r
+index 0875b0e42755..7235fde12f56 100644\r
+--- a/lib/query.cc\r
++++ b/lib/query.cc\r
+@@ -276,7 +276,7 @@ _notmuch_query_search_documents (notmuch_query_t *query,\r
+ case NOTMUCH_SORT_MESSAGE_ID:\r
+ enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, FALSE);\r
+ break;\r
+- case NOTMUCH_SORT_UNSORTED:\r
++ case NOTMUCH_SORT_UNSORTED:\r
+ break;\r
+ }\r
+ \r
+@@ -412,7 +412,7 @@ _notmuch_doc_id_set_contains (notmuch_doc_id_set_t *doc_ids,\r
+ \r
+ void\r
+ _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,\r
+- unsigned int doc_id)\r
++ unsigned int doc_id)\r
+ {\r
+ if (doc_id < doc_ids->bound)\r
+ doc_ids->bitmap[DOCIDSET_WORD(doc_id)] &= ~(1 << DOCIDSET_BIT(doc_id));\r
+diff --git a/lib/sha1.c b/lib/sha1.c\r
+index 94060d577233..8a6d42299e75 100644\r
+--- a/lib/sha1.c\r
++++ b/lib/sha1.c\r
+@@ -112,4 +112,3 @@ _notmuch_sha1_of_file (const char *filename)\r
+ \r
+ return result;\r
+ }\r
+-\r
+-- \r
+2.8.2\r
+\r
projects / notmuch-archives.git / commitdiff