[PATCH 1/4] lib: add passthrough logger function

diff --git a/7e/e3207569f4985eaf58cc3f6432e1dbb892bd49 b/7e/e3207569f4985eaf58cc3f6432e1dbb892bd49
new file mode 100644 (file)
index 0000000..ac85e0f
--- /dev/null
+++ b/7e/e3207569f4985eaf58cc3f6432e1dbb892bd49
@@ -0,0 +1,111 @@
+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 19B96429E2F\r
+       for <notmuch@notmuchmail.org>; Fri, 26 Dec 2014 09:43:32 -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 lzVi4lkXW0Vx for <notmuch@notmuchmail.org>;\r
+       Fri, 26 Dec 2014 09:43:31 -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 18FB0429E2E\r
+       for <notmuch@notmuchmail.org>; Fri, 26 Dec 2014 09:43:31 -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 1Y4YvC-00060J-My; Fri, 26 Dec 2014 13:43:30 -0400\r
+Received: (nullmailer pid 21754 invoked by uid 1000); Fri, 26 Dec 2014\r
+       17:43:08 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/4] lib: add passthrough logger function\r
+Date: Fri, 26 Dec 2014 18:42:38 +0100\r
+Message-Id: <1419615761-21581-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.3\r
+In-Reply-To: <1419615761-21581-1-git-send-email-david@tethera.net>\r
+References: <1419615761-21581-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: Fri, 26 Dec 2014 17:43:32 -0000\r
+\r
+As a first step to eliminating all the fprintfs in the library, make a\r
+logger function that just calls fprintf. This is a bit more complex\r
+than needed, because we want to do something more interesting with the\r
+formatted string in the future.\r
+---\r
+ lib/database.cc | 19 +++++++++++++++++++\r
+ lib/notmuch.h   | 10 +++++++++-\r
+ 2 files changed, 28 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 3601f9d..f3c62ee 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -916,6 +916,25 @@ notmuch_database_open (const char *path,\r
+     return status;\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
++    message = talloc_vasprintf (notmuch, format, va_args);\r
++\r
++    /* XXX do something more clever here */\r
++    fputs (message, stderr);\r
++\r
++    talloc_free ((char *)message);\r
++\r
++}\r
++\r
+ notmuch_status_t\r
+ notmuch_database_close (notmuch_database_t *notmuch)\r
+ {\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index 220839b..c8c8124 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -279,7 +279,15 @@ notmuch_status_t\r
+ notmuch_database_open (const char *path,\r
+                      notmuch_database_mode_t mode,\r
+                      notmuch_database_t **database);\r
+-\r
++/**\r
++ * Log a message to where the database is configured to log it\r
++ *\r
++ * Initially this does notmuch interesting, since the output is not\r
++ * yet configurable.\r
++ */\r
++void\r
++notmuch_database_log (notmuch_database_t *notmuch,\r
++                    const char *format, ...);\r
+ /**\r
+  * Commit changes and close the given notmuch database.\r
+  *\r
+-- \r
+2.1.3\r
+\r