[Patch v4 5/9] lib/database: add field for last error string

diff --git a/1d/3ffd24dca9e2c3ab3f435e2b627313934427c2 b/1d/3ffd24dca9e2c3ab3f435e2b627313934427c2
new file mode 100644 (file)
index 0000000..7d11a3c
--- /dev/null
+++ b/1d/3ffd24dca9e2c3ab3f435e2b627313934427c2
@@ -0,0 +1,115 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8416C429E26\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Mar 2015 10:05:14 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id mfCIvlBhkBo8 for <notmuch@notmuchmail.org>;\r
+       Sat, 14 Mar 2015 10:05:13 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+       [87.98.215.224])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 895D8429E2E\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Mar 2015 10:05:12 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+       4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1YWpUC-00028e-Cn; Sat, 14 Mar 2015 17:04:28 +0000\r
+Received: (nullmailer pid 4989 invoked by uid 1000); Sat, 14 Mar 2015\r
+       17:02:41 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v4 5/9] lib/database: add field for last error string\r
+Date: Sat, 14 Mar 2015 18:02:30 +0100\r
+Message-Id: <1426352554-4383-6-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1426352554-4383-1-git-send-email-david@tethera.net>\r
+References: <1426352554-4383-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 14 Mar 2015 17:05:14 -0000\r
+\r
+The idea is to have a logging function setting this string instead of\r
+printing to stderr.\r
+---\r
+ lib/database-private.h | 4 ++++\r
+ lib/database.cc        | 7 +++++++\r
+ lib/notmuch.h          | 7 +++++++\r
+ 3 files changed, 18 insertions(+)\r
+\r
+diff --git a/lib/database-private.h b/lib/database-private.h\r
+index 6d6fa2c..24243db 100644\r
+--- a/lib/database-private.h\r
++++ b/lib/database-private.h\r
+@@ -154,6 +154,10 @@ struct _notmuch_database {\r
+     unsigned int last_doc_id;\r
+     uint64_t last_thread_id;\r
+ \r
++    /* error reporting; this value persists only until the\r
++     * next library call. May be NULL */\r
++    char *status_string;\r
++\r
+     Xapian::QueryParser *query_parser;\r
+     Xapian::TermGenerator *term_gen;\r
+     Xapian::ValueRangeProcessor *value_range_processor;\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index b774edc..48a830f 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -873,6 +873,7 @@ notmuch_database_open_verbose (const char *path,\r
+ \r
+     notmuch = talloc_zero (NULL, notmuch_database_t);\r
+     notmuch->exception_reported = FALSE;\r
++    notmuch->status_string = NULL;\r
+     notmuch->path = talloc_strdup (notmuch, path);\r
+ \r
+     if (notmuch->path[strlen (notmuch->path) - 1] == '/')\r
+@@ -2558,3 +2559,9 @@ notmuch_database_get_all_tags (notmuch_database_t *db)\r
+       return NULL;\r
+     }\r
+ }\r
++\r
++const char *\r
++notmuch_database_status_string (notmuch_database_t *notmuch)\r
++{\r
++    return notmuch->status_string;\r
++}\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index c671d82..20c4e01 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -302,6 +302,13 @@ notmuch_database_open_verbose (const char *path,\r
+                              char **error_message);\r
+ \r
+ /**\r
++ * Retrieve last status string for given database.\r
++ *\r
++ */\r
++const char *\r
++notmuch_database_status_string (notmuch_database_t *notmuch);\r
++\r
++/**\r
+  * Commit changes and close the given notmuch database.\r
+  *\r
+  * After notmuch_database_close has been called, calls to other\r
+-- \r
+2.1.4\r
+\r