1 Return-Path: <too@guru-group.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by arlo.cworth.org (Postfix) with ESMTP id E3B486DE0188
\r
6 for <notmuch@notmuchmail.org>; Sat, 28 May 2016 10:45:58 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.009 tagged_above=-999 required=5
\r
12 tests=[HEADER_FROM_DIFFERENT_DOMAINS=0.001, T_RP_MATCHES_RCVD=-0.01]
\r
14 Received: from arlo.cworth.org ([127.0.0.1])
\r
15 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id 1xNKKTQz1pQu for <notmuch@notmuchmail.org>;
\r
17 Sat, 28 May 2016 10:45:49 -0700 (PDT)
\r
18 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
19 by arlo.cworth.org (Postfix) with ESMTP id F0F4D6DE00CE
\r
20 for <notmuch@notmuchmail.org>; Sat, 28 May 2016 10:45:48 -0700 (PDT)
\r
21 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
22 id ECA361000B3; Sat, 28 May 2016 20:45:32 +0300 (EEST)
\r
23 From: Tomi Ollila <too@iki.fi>
\r
24 To: notmuch@notmuchmail.org
\r
25 Cc: tomi.ollila@iki.fi
\r
26 Subject: [PATCH] lib: whitespace cleanup
\r
27 Date: Sat, 28 May 2016 20:45:31 +0300
\r
28 Message-Id: <1464457531-956-1-git-send-email-too@iki.fi>
\r
29 X-Mailer: git-send-email 2.8.2
\r
30 X-BeenThere: notmuch@notmuchmail.org
\r
31 X-Mailman-Version: 2.1.20
\r
33 List-Id: "Use and development of the notmuch mail system."
\r
34 <notmuch.notmuchmail.org>
\r
35 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
36 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
37 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
38 List-Post: <mailto:notmuch@notmuchmail.org>
\r
39 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
40 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
42 X-List-Received-Date: Sat, 28 May 2016 17:45:59 -0000
\r
44 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
46 Cleaned the following whitespace in lib/* files:
\r
48 lib/index.cc: 1 line: trailing whitespace
\r
49 lib/database.cc 5 lines: 8 spaces at the beginning of line
\r
50 lib/notmuch-private.h: 4 lines: 8 spaces at the beginning of line
\r
51 lib/message.cc: 1 line: trailing whitespace
\r
52 lib/sha1.c: 1 line: empty lines at the end of file
\r
53 lib/query.cc: 2 lines: 8 spaces at the beginning of line
\r
54 lib/gen-version-script.sh: 1 line: trailing whitespace
\r
57 Cleaned lib as it was easiest to compare these doesn't collide
\r
58 with any patches in review queue. There are plenty of more to
\r
59 be cleaned up, perhaps later...
\r
61 lib/database.cc | 10 +++++-----
\r
62 lib/gen-version-script.sh | 2 +-
\r
64 lib/message.cc | 2 +-
\r
65 lib/notmuch-private.h | 8 ++++----
\r
66 lib/query.cc | 4 ++--
\r
68 7 files changed, 14 insertions(+), 15 deletions(-)
\r
70 diff --git a/lib/database.cc b/lib/database.cc
\r
71 index 96300008765e..0b6041022613 100644
\r
72 --- a/lib/database.cc
\r
73 +++ b/lib/database.cc
\r
74 @@ -2177,8 +2177,8 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
\r
75 * References header, if available. If not, fall back to the
\r
76 * first message ID in the In-Reply-To header. */
\r
77 if (last_ref_message_id) {
\r
78 - _notmuch_message_add_term (message, "replyto",
\r
79 - last_ref_message_id);
\r
80 + _notmuch_message_add_term (message, "replyto",
\r
81 + last_ref_message_id);
\r
82 } else if (in_reply_to_message_id) {
\r
83 _notmuch_message_add_term (message, "replyto",
\r
84 in_reply_to_message_id);
\r
85 @@ -2287,15 +2287,15 @@ _consume_metadata_thread_id (void *ctx, notmuch_database_t *notmuch,
\r
86 if (stored_id.empty ()) {
\r
89 - Xapian::WritableDatabase *db;
\r
90 + Xapian::WritableDatabase *db;
\r
92 db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);
\r
94 /* Clear the metadata for this message ID. We don't need it
\r
96 - db->set_metadata (metadata_key, "");
\r
97 + db->set_metadata (metadata_key, "");
\r
99 - return talloc_strdup (ctx, stored_id.c_str ());
\r
100 + return talloc_strdup (ctx, stored_id.c_str ());
\r
104 diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh
\r
105 index 847700114ef8..0f908093dc5e 100644
\r
106 --- a/lib/gen-version-script.sh
\r
107 +++ b/lib/gen-version-script.sh
\r
108 @@ -17,7 +17,7 @@ nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $3 ~ "Xapian.*Error" {print $3
\r
110 demangled=$(c++filt $sym)
\r
117 diff --git a/lib/index.cc b/lib/index.cc
\r
118 index f166aefd2fc1..8aa844e4161d 100644
\r
121 @@ -144,7 +144,7 @@ filter_filter (GMimeFilter *gmime_filter, char *inbuf, size_t inlen, size_t pres
\r
122 {9, ' ', ' ', 10, 0},
\r
123 {10, '\n', '\n', 11, 10},
\r
124 {11, 'M', 'M', 12, 0},
\r
125 - {12, ' ', '`', 12, 11}
\r
126 + {12, ' ', '`', 12, 11}
\r
130 diff --git a/lib/message.cc b/lib/message.cc
\r
131 index 68393055b3eb..022268796fc7 100644
\r
132 --- a/lib/message.cc
\r
133 +++ b/lib/message.cc
\r
134 @@ -1444,7 +1444,7 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)
\r
136 for (i = 0; i < ARRAY_SIZE(flag2tag); i++) {
\r
137 if ((strchr (combined_flags, flag2tag[i].flag) != NULL)
\r
140 flag2tag[i].inverse)
\r
142 status = notmuch_message_add_tag (message, flag2tag[i].tag);
\r
143 diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
\r
144 index 92807975bb94..6063262a1e3a 100644
\r
145 --- a/lib/notmuch-private.h
\r
146 +++ b/lib/notmuch-private.h
\r
147 @@ -158,8 +158,8 @@ typedef enum _notmuch_private_status {
\r
148 ((private_status >= (notmuch_private_status_t) NOTMUCH_STATUS_LAST_STATUS)\
\r
150 _internal_error (format " (%s).\n", \
\r
155 (notmuch_status_t) NOTMUCH_PRIVATE_STATUS_SUCCESS \
\r
157 (notmuch_status_t) private_status)
\r
158 @@ -477,11 +477,11 @@ _notmuch_mset_messages_move_to_next (notmuch_messages_t *messages);
\r
161 _notmuch_doc_id_set_contains (notmuch_doc_id_set_t *doc_ids,
\r
162 - unsigned int doc_id);
\r
163 + unsigned int doc_id);
\r
166 _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,
\r
167 - unsigned int doc_id);
\r
168 + unsigned int doc_id);
\r
170 /* querying xapian documents by type (e.g. "mail" or "ghost"): */
\r
172 diff --git a/lib/query.cc b/lib/query.cc
\r
173 index 0875b0e42755..7235fde12f56 100644
\r
176 @@ -276,7 +276,7 @@ _notmuch_query_search_documents (notmuch_query_t *query,
\r
177 case NOTMUCH_SORT_MESSAGE_ID:
\r
178 enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, FALSE);
\r
180 - case NOTMUCH_SORT_UNSORTED:
\r
181 + case NOTMUCH_SORT_UNSORTED:
\r
185 @@ -412,7 +412,7 @@ _notmuch_doc_id_set_contains (notmuch_doc_id_set_t *doc_ids,
\r
188 _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,
\r
189 - unsigned int doc_id)
\r
190 + unsigned int doc_id)
\r
192 if (doc_id < doc_ids->bound)
\r
193 doc_ids->bitmap[DOCIDSET_WORD(doc_id)] &= ~(1 << DOCIDSET_BIT(doc_id));
\r
194 diff --git a/lib/sha1.c b/lib/sha1.c
\r
195 index 94060d577233..8a6d42299e75 100644
\r
198 @@ -112,4 +112,3 @@ _notmuch_sha1_of_file (const char *filename)
\r