lib: whitespace cleanup

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

diff --git a/lib/database.cc b/lib/database.cc
index 96300008765e445f146ec2b3ce93b03df792b1cf..0b60410226137e9ec5117a368bfb647524185b18 100644 (file)
--- 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) {
      * 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);
     } 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 {
     if (stored_id.empty ()) {
        return NULL;
     } else {

-        Xapian::WritableDatabase *db;
+       Xapian::WritableDatabase *db;

 
        db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);
 
        /* Clear the metadata for this message ID. We don't need it
         * anymore. */
 
        db = static_cast <Xapian::WritableDatabase *> (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 847700114ef8df1f634db307dd22423c655c90e8..0f908093dc5e6de1da8b281f191e4b6dc34b675e 100644 (file)
--- 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
 while read sym; do
     demangled=$(c++filt $sym)
     case $demangled in

-       typeinfo*) 
+       typeinfo*)

            printf "\t$sym;\n"
            ;;
        *)
            printf "\t$sym;\n"
            ;;
        *)

diff --git a/lib/index.cc b/lib/index.cc
index f166aefd2fc1f6f6c5ea1e306e4fc033ead09c59..8aa844e4161dda42d0f7ca4fb5d00cd336a40091 100644 (file)
--- 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},
        {9,  ' ',  ' ',  10, 0},
        {10, '\n', '\n', 11, 10},
        {11, 'M',  'M',  12, 0},

-       {12, ' ',  '`',  12, 11}  
+       {12, ' ',  '`',  12, 11}

     };
     int next;
 
     };
     int next;
 

diff --git a/lib/message.cc b/lib/message.cc
index 68393055b3eb73b73ee3a1a4b5bde38ce8d94c73..022268796fc7f24dc8b435d42b7f0e67c4de230f 100644 (file)
--- 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)
 
     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);
            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 92807975bb94562faefc949c19c080b9ad76618e..6063262a1e3a5e0f67b7d35844ba08b730c6a3e5 100644 (file)
--- 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",                               \
     ((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)
      (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,
 
 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,
 
 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
 
 /* querying xapian documents by type (e.g. "mail" or "ghost"): */
 notmuch_status_t

diff --git a/lib/query.cc b/lib/query.cc
index 0875b0e42755d8e97d7110eb0d56670207553fe4..7235fde12f560c9fd9b77b29359c8667bc392304 100644 (file)
--- 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_MESSAGE_ID:
            enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, FALSE);
            break;

-        case NOTMUCH_SORT_UNSORTED:
+       case NOTMUCH_SORT_UNSORTED:

            break;
        }
 
            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,
 
 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));
 {
     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 94060d577233a4602b37a70b2343404c5dc28da3..8a6d42299e755981bd0a026721f99e27e918b2b6 100644 (file)
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -112,4 +112,3 @@ _notmuch_sha1_of_file (const char *filename)
 
     return result;
 }
 
     return result;
 }

-