[PATCH 1/2] lib/compact: replace deprecated notmuch_database_open_verbose

[PATCH 1/2] lib/compact: replace deprecated notmuch_database_open_verbose

[David Bremner]

It should not be necesary to have any config information here, hence
passing "" to n_d_open_with_config.
---
 lib/database.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/database.cc b/lib/database.cc
index 7eb0de79..6ef56d56 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -590,10 +590,12 @@ notmuch_database_compact (const char *path,
     notmuch_database_t *notmuch = NULL;
     char *message = NULL;
 
-    ret = notmuch_database_open_verbose (path,
-					 NOTMUCH_DATABASE_MODE_READ_WRITE,
-					 &notmuch,
-					 &message);
+    ret = notmuch_database_open_with_config (path,
+					     NOTMUCH_DATABASE_MODE_READ_WRITE,
+					     "",
+					     NULL,
+					     &notmuch,
+					     &message);
     if (ret) {
 	if (status_cb) status_cb (message, closure);
 	return ret;
-- 
2.33.0

[PATCH 2/2] lib/open: replace call to deprecated notmuch_database_open_verbose

[David Bremner]

Essentially inline the existing shim definition of
notmuch_database_open_verbose.
---
 lib/open.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/open.cc b/lib/open.cc
index 8a835e98..86faf1d9 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -19,9 +19,8 @@ notmuch_database_open (const char *path,
     char *status_string = NULL;
     notmuch_status_t status;
 
-    status = notmuch_database_open_verbose (path, mode, database,
-					    &status_string);
-
+    status = notmuch_database_open_with_config (path, mode, "", NULL,
+						database, &status_string);
     if (status_string) {
 	fputs (status_string, stderr);
 	free (status_string);
-- 
2.33.0

Re: [PATCH 1/2] lib/compact: replace deprecated notmuch_database_open_verbose

[David Bremner]

David Bremner <david@tethera.net> writes:

> It should not be necesary to have any config information here, hence
> passing "" to n_d_open_with_config.

series applied to master (since that's where the deprecation warnings
are).