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