[Patch v4 6/9] lib: add a log function with output to a string in notmuch_database_t

diff --git a/ab/c9517e2242f57c93ca8ac35e1385b7a2a2bdfe b/ab/c9517e2242f57c93ca8ac35e1385b7a2a2bdfe
new file mode 100644 (file)
index 0000000..98b5696
--- /dev/null
+++ b/ab/c9517e2242f57c93ca8ac35e1385b7a2a2bdfe
@@ -0,0 +1,101 @@
+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 C59FA431FD6\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Mar 2015 10:04:19 -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 SOdswf5HBszG for <notmuch@notmuchmail.org>;\r
+       Sat, 14 Mar 2015 10:04:17 -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 9105B431FD7\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Mar 2015 10:04:16 -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 1YWpTL-00026i-2v; Sat, 14 Mar 2015 17:03:35 +0000\r
+Received: (nullmailer pid 4991 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 6/9] lib: add a log function with output to a string in\r
+       notmuch_database_t\r
+Date: Sat, 14 Mar 2015 18:02:31 +0100\r
+Message-Id: <1426352554-4383-7-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:04:20 -0000\r
+\r
+This is a thin wrapper around the previously implemented string\r
+logging infrastructure. In the future it could have more configurable\r
+output options.\r
+---\r
+ lib/database.cc       | 14 ++++++++++++++\r
+ lib/notmuch-private.h |  4 ++++\r
+ 2 files changed, 18 insertions(+)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 48a830f..0409128 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -377,6 +377,20 @@ log_to_string (char **str,\r
+     va_end (va_args);\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
++    vlog_to_string (notmuch, &notmuch->status_string, 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
+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
+-- \r
+2.1.4\r
+\r