--- /dev/null
+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 33F69429E32\r
+ for <notmuch@notmuchmail.org>; Tue, 24 Mar 2015 06:25:35 -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=unavailable\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 aL72mQeGrg6O for <notmuch@notmuchmail.org>;\r
+ Tue, 24 Mar 2015 06:25:34 -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 94762429E41\r
+ for <notmuch@notmuchmail.org>; Tue, 24 Mar 2015 06:25:24 -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 1YaOoy-0000ry-15; Tue, 24 Mar 2015 13:24:40 +0000\r
+Received: (nullmailer pid 2684 invoked by uid 1000); Tue, 24 Mar 2015\r
+ 13:24:25 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: [Patch v5 5/8] lib: add a log function with output to a string in\r
+ notmuch_database_t\r
+Date: Tue, 24 Mar 2015 09:24:08 -0400\r
+Message-Id: <1427203451-1540-6-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1427203451-1540-1-git-send-email-david@tethera.net>\r
+References: <1426352554-4383-10-git-send-email-david@tethera.net>\r
+ <1427203451-1540-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: Tue, 24 Mar 2015 13:25:37 -0000\r
+\r
+In principle in the future this could do something fancier than sprintf.\r
+---\r
+ lib/database-private.h | 4 ++++\r
+ lib/database.cc | 24 ++++++++++++++++++++++++\r
+ lib/notmuch-private.h | 4 ++++\r
+ lib/notmuch.h | 7 +++++++\r
+ 4 files changed, 39 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 36849d7..673561b 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -348,6 +348,23 @@ notmuch_status_to_string (notmuch_status_t status)\r
+ }\r
+ }\r
+ \r
++void\r
++_notmuch_database_log (notmuch_database_t *notmuch,\r
++ const char *format,\r
++ ...)\r
++{\r
++ va_list va_args;\r
++\r
++ va_start (va_args, format);\r
++\r
++ if (notmuch->status_string)\r
++ talloc_free (notmuch->status_string);\r
++\r
++ notmuch->status_string = talloc_vasprintf (notmuch, format, va_args);\r
++\r
++ va_end (va_args);\r
++}\r
++\r
+ static void\r
+ find_doc_ids_for_term (notmuch_database_t *notmuch,\r
+ const char *term,\r
+@@ -845,6 +862,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
+@@ -2530,3 +2548,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-private.h b/lib/notmuch-private.h\r
+index 8a1f2fa..7cb6fd4 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -190,6 +190,10 @@ _notmuch_message_id_compressed (void *ctx, const char *message_id);\r
+ notmuch_status_t\r
+ _notmuch_database_ensure_writable (notmuch_database_t *notmuch);\r
+ \r
++void\r
++_notmuch_database_log (notmuch_database_t *notmuch,\r
++ const char *format, ...);\r
++\r
+ const char *\r
+ _notmuch_database_relative_path (notmuch_database_t *notmuch,\r
+ const char *path);\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
projects / notmuch-archives.git / commitdiff