[PATCH 1/6] lib: construct compactor within try block to catch any exceptions
Jani Nikula
jani at nikula.org
Fri Nov 1 07:27:10 PDT 2013
Constructors may also throw exceptions. Catch them.
---
lib/database.cc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index 20e5ec2..3dfea0f 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -864,7 +864,6 @@ notmuch_database_compact (const char* path,
notmuch_compact_status_cb_t status_cb)
{
void *local = talloc_new (NULL);
- NotmuchCompactor compactor(status_cb);
char *notmuch_path, *xapian_path, *compact_xapian_path;
char *old_xapian_path = NULL;
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
@@ -910,6 +909,8 @@ notmuch_database_compact (const char* path,
}
try {
+ NotmuchCompactor compactor(status_cb);
+
compactor.set_renumber(false);
compactor.add_source(xapian_path);
compactor.set_destdir(compact_xapian_path);
--
1.7.2.5
More information about the notmuch
mailing list