[PATCH v2 3/6] lib: add a log function with output to a string in notmuch_database_t

diff --git a/dd/ffc86512989e07b2a877e33feb289a5bd26b38 b/dd/ffc86512989e07b2a877e33feb289a5bd26b38
new file mode 100644 (file)
index 0000000..f7871c6
--- /dev/null
+++ b/dd/ffc86512989e07b2a877e33feb289a5bd26b38
@@ -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 E9B5A429E30\r
+       for <notmuch@notmuchmail.org>; Sat, 27 Dec 2014 14:05:56 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 UlURnNLgalEU for <notmuch@notmuchmail.org>;\r
+       Sat, 27 Dec 2014 14:05:54 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\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 AB5D1431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 27 Dec 2014 14:05:54 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1Y4zUf-0000DP-U5; Sat, 27 Dec 2014 18:05:53 -0400\r
+Received: (nullmailer pid 1477 invoked by uid 1000); Sat, 27 Dec 2014\r
+       22:05:48 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/6] lib: add a log function with output to a string in\r
+       notmuch_database_t\r
+Date: Sat, 27 Dec 2014 23:05:34 +0100\r
+Message-Id: <1419717937-1108-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.3\r
+In-Reply-To: <1419717937-1108-1-git-send-email-david@tethera.net>\r
+References: <1419717937-1108-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, 27 Dec 2014 22:05:57 -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       | 15 +++++++++++++++\r
+ lib/notmuch-private.h |  4 ++++\r
+ 2 files changed, 19 insertions(+)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 249eb68..ee1c982 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -371,6 +371,21 @@ 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
++    const char *message;\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 012ad25..7c6cfc0 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -191,6 +191,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.3\r
+\r