From 0076441c338225edb0837e4e995d3528bbbf05af Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 13 Nov 2013 19:02:43 +0200 Subject: [PATCH] [PATCH v2 1/5] compact: tidy formatting --- 95/efb4dc7f48c248b0e66ff36f9ad93dde250155 | 241 ++++++++++++++++++++++ 1 file changed, 241 insertions(+) create mode 100644 95/efb4dc7f48c248b0e66ff36f9ad93dde250155 diff --git a/95/efb4dc7f48c248b0e66ff36f9ad93dde250155 b/95/efb4dc7f48c248b0e66ff36f9ad93dde250155 new file mode 100644 index 000000000..db1a74323 --- /dev/null +++ b/95/efb4dc7f48c248b0e66ff36f9ad93dde250155 @@ -0,0 +1,241 @@ +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 DFEEC431FC7 + for ; Wed, 13 Nov 2013 09:03:14 -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 kQDGE-eCXsEI for ; + Wed, 13 Nov 2013 09:03:09 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 8578A431E62 + for ; Wed, 13 Nov 2013 09:02:59 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id AAB2F1000E5; Wed, 13 Nov 2013 19:02:50 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH v2 1/5] compact: tidy formatting +Date: Wed, 13 Nov 2013 19:02:43 +0200 +Message-Id: <1384362167-12740-2-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <1384362167-12740-1-git-send-email-tomi.ollila@iki.fi> +References: <1384362167-12740-1-git-send-email-tomi.ollila@iki.fi> +Cc: tomi.ollila@iki.fi +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: Wed, 13 Nov 2013 17:03:15 -0000 + +Notmuch compact code whitespace changes to match devel/STYLE. +--- + lib/database.cc | 62 ++++++++++++++++++++++++++++--------------------------- + notmuch-compact.c | 4 ++-- + 2 files changed, 34 insertions(+), 32 deletions(-) + +diff --git a/lib/database.cc b/lib/database.cc +index a021bf1..3c008d6 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -805,17 +805,19 @@ notmuch_database_close (notmuch_database_t *notmuch) + } + + #if HAVE_XAPIAN_COMPACT +-static int unlink_cb (const char *path, +- unused (const struct stat *sb), +- unused (int type), +- unused (struct FTW *ftw)) ++static int ++unlink_cb (const char *path, ++ unused (const struct stat *sb), ++ unused (int type), ++ unused (struct FTW *ftw)) + { +- return remove(path); ++ return remove (path); + } + +-static int rmtree (const char *path) ++static int ++rmtree (const char *path) + { +- return nftw(path, unlink_cb, 64, FTW_DEPTH | FTW_PHYS); ++ return nftw (path, unlink_cb, 64, FTW_DEPTH | FTW_PHYS); + } + + class NotmuchCompactor : public Xapian::Compactor +@@ -825,17 +827,17 @@ class NotmuchCompactor : public Xapian::Compactor + + public: + NotmuchCompactor(notmuch_compact_status_cb_t cb, void *closure) : +- status_cb(cb), status_closure(closure) { } ++ status_cb (cb), status_closure (closure) { } + + virtual void + set_status (const std::string &table, const std::string &status) + { +- char* msg; ++ char *msg; + + if (status_cb == NULL) + return; + +- if (status.length() == 0) ++ if (status.length () == 0) + msg = talloc_asprintf (NULL, "compacting table %s", table.c_str()); + else + msg = talloc_asprintf (NULL, " %s", status.c_str()); +@@ -844,8 +846,8 @@ public: + return; + } + +- status_cb(msg, status_closure); +- talloc_free(msg); ++ status_cb (msg, status_closure); ++ talloc_free (msg); + } + }; + +@@ -861,8 +863,8 @@ public: + * compaction process to protect data integrity. + */ + notmuch_status_t +-notmuch_database_compact (const char* path, +- const char* backup_path, ++notmuch_database_compact (const char *path, ++ const char *backup_path, + notmuch_compact_status_cb_t status_cb, + void *closure) + { +@@ -876,7 +878,7 @@ notmuch_database_compact (const char* path, + if (! local) + return NOTMUCH_STATUS_OUT_OF_MEMORY; + +- ret = notmuch_database_open(path, NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much); ++ ret = notmuch_database_open (path, NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much); + if (ret) { + goto DONE; + } +@@ -897,25 +899,25 @@ notmuch_database_compact (const char* path, + } + + if (backup_path != NULL) { +- if (stat(backup_path, &statbuf) != -1) { ++ if (stat (backup_path, &statbuf) != -1) { + fprintf (stderr, "Backup path already exists: %s\n", backup_path); + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; + } + if (errno != ENOENT) { + fprintf (stderr, "Unknown error while stat()ing backup path: %s\n", +- strerror(errno)); ++ strerror (errno)); + goto DONE; + } + } + + try { +- NotmuchCompactor compactor(status_cb, closure); ++ NotmuchCompactor compactor (status_cb, closure); + +- compactor.set_renumber(false); +- compactor.add_source(xapian_path); +- compactor.set_destdir(compact_xapian_path); +- compactor.compact(); ++ compactor.set_renumber (false); ++ compactor.add_source (xapian_path); ++ compactor.set_destdir (compact_xapian_path); ++ compactor.compact (); + } catch (Xapian::InvalidArgumentError e) { + fprintf (stderr, "Error while compacting: %s\n", e.get_msg().c_str()); + ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION; +@@ -923,33 +925,33 @@ notmuch_database_compact (const char* path, + } + + if (backup_path) { +- if (rename(xapian_path, backup_path)) { ++ if (rename (xapian_path, backup_path)) { + fprintf (stderr, "Error moving old database out of the way\n"); + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; + } + } else { +- rmtree(xapian_path); ++ rmtree (xapian_path); + } + +- if (rename(compact_xapian_path, xapian_path)) { ++ if (rename (compact_xapian_path, xapian_path)) { + fprintf (stderr, "Error moving compacted database\n"); + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; + } + +-DONE: ++ DONE: + if (notmuch) + notmuch_database_destroy (notmuch); + +- talloc_free(local); ++ talloc_free (local); + + return ret; + } + #else + notmuch_status_t +-notmuch_database_compact (unused (const char* path), +- unused (const char* backup_path), ++notmuch_database_compact (unused (const char *path), ++ unused (const char *backup_path), + unused (notmuch_compact_status_cb_t status_cb), + unused (void *closure)) + { +@@ -1538,7 +1540,7 @@ _notmuch_database_generate_doc_id (notmuch_database_t *notmuch) + notmuch->last_doc_id++; + + if (notmuch->last_doc_id == 0) +- INTERNAL_ERROR ("Xapian document IDs are exhausted.\n"); ++ INTERNAL_ERROR ("Xapian document IDs are exhausted.\n"); + + return notmuch->last_doc_id; + } +diff --git a/notmuch-compact.c b/notmuch-compact.c +index 8022dfe..8b820c0 100644 +--- a/notmuch-compact.c ++++ b/notmuch-compact.c +@@ -23,7 +23,7 @@ + static void + status_update_cb (const char *msg, unused (void *closure)) + { +- printf("%s\n", msg); ++ printf ("%s\n", msg); + } + + int +@@ -49,7 +49,7 @@ notmuch_compact_command (notmuch_config_t *config, int argc, char *argv[]) + ret = notmuch_database_compact (path, backup_path, + quiet ? NULL : status_update_cb, NULL); + if (ret) { +- fprintf (stderr, "Compaction failed: %s\n", notmuch_status_to_string(ret)); ++ fprintf (stderr, "Compaction failed: %s\n", notmuch_status_to_string (ret)); + return 1; + } + +-- +1.8.3.1 + -- 2.26.2