diff options
| author |  Jani Nikula <jani@nikula.org> | 2013-11-03 14:24:45 +0200 |
|---|---|---|
| committer |  David Bremner <david@tethera.net> | 2013-11-07 06:46:42 -0400 |
| commit | 180dba66e47a5257b2cdf2f1ceb59cc8fa5a69d4 (patch) | |
| tree | 3cc88a821018e363d2805df39c7b3920c7524c71 /lib/database.cc | |
| parent | 35ca5feb28a6e52851ba61ea63478ade40991558 (diff) | |
lib: add closure parameter to compact status update callback
This provides much more flexibility for the caller.
Diffstat (limited to 'lib/database.cc')
| -rw-r--r-- | lib/database.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/database.cc b/lib/database.cc index eadf8a76..5a017034 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -821,9 +821,11 @@ static int rmtree (const char *path) class NotmuchCompactor : public Xapian::Compactor { notmuch_compact_status_cb_t status_cb; + void *status_closure; public: - NotmuchCompactor(notmuch_compact_status_cb_t cb) : status_cb(cb) { } + NotmuchCompactor(notmuch_compact_status_cb_t cb, void *closure) : + status_cb(cb), status_closure(closure) { } virtual void set_status (const std::string &table, const std::string &status) @@ -842,7 +844,7 @@ public: return; } - status_cb(msg); + status_cb(msg, status_closure); talloc_free(msg); } }; @@ -861,7 +863,8 @@ public: notmuch_status_t notmuch_database_compact (const char* path, const char* backup_path, - notmuch_compact_status_cb_t status_cb) + notmuch_compact_status_cb_t status_cb, + void *closure) { void *local; char *notmuch_path, *xapian_path, *compact_xapian_path; @@ -913,7 +916,7 @@ notmuch_database_compact (const char* path, } try { - NotmuchCompactor compactor(status_cb); + NotmuchCompactor compactor(status_cb, closure); compactor.set_renumber(false); compactor.add_source(xapian_path); @@ -953,7 +956,8 @@ DONE: notmuch_status_t notmuch_database_compact (unused (const char* path), unused (const char* backup_path), - unused (notmuch_compact_status_cb_t status_cb)) + unused (notmuch_compact_status_cb_t status_cb), + unused (void *closure)) { fprintf (stderr, "notmuch was compiled against a xapian version lacking compaction support.\n"); return NOTMUCH_STATUS_UNSUPPORTED_OPERATION; |