1 Return-Path: <bremner@tesseract.cs.unb.ca>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id E9B5A429E30
\r
6 for <notmuch@notmuchmail.org>; Sat, 27 Dec 2014 14:05:56 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id UlURnNLgalEU for <notmuch@notmuchmail.org>;
\r
16 Sat, 27 Dec 2014 14:05:54 -0800 (PST)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id AB5D1431FBC
\r
21 for <notmuch@notmuchmail.org>; Sat, 27 Dec 2014 14:05:54 -0800 (PST)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
24 id 1Y4zUf-0000DP-U5; Sat, 27 Dec 2014 18:05:53 -0400
\r
25 Received: (nullmailer pid 1477 invoked by uid 1000); Sat, 27 Dec 2014
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH v2 3/6] lib: add a log function with output to a string in
\r
31 Date: Sat, 27 Dec 2014 23:05:34 +0100
\r
32 Message-Id: <1419717937-1108-4-git-send-email-david@tethera.net>
\r
33 X-Mailer: git-send-email 2.1.3
\r
34 In-Reply-To: <1419717937-1108-1-git-send-email-david@tethera.net>
\r
35 References: <1419717937-1108-1-git-send-email-david@tethera.net>
\r
36 X-BeenThere: notmuch@notmuchmail.org
\r
37 X-Mailman-Version: 2.1.13
\r
39 List-Id: "Use and development of the notmuch mail system."
\r
40 <notmuch.notmuchmail.org>
\r
41 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
42 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
43 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
44 List-Post: <mailto:notmuch@notmuchmail.org>
\r
45 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
46 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
48 X-List-Received-Date: Sat, 27 Dec 2014 22:05:57 -0000
\r
50 This is a thin wrapper around the previously implemented string
\r
51 logging infrastructure. In the future it could have more configurable
\r
54 lib/database.cc | 15 +++++++++++++++
\r
55 lib/notmuch-private.h | 4 ++++
\r
56 2 files changed, 19 insertions(+)
\r
58 diff --git a/lib/database.cc b/lib/database.cc
\r
59 index 249eb68..ee1c982 100644
\r
60 --- a/lib/database.cc
\r
61 +++ b/lib/database.cc
\r
62 @@ -371,6 +371,21 @@ log_to_string (char **str,
\r
67 +_notmuch_database_log (notmuch_database_t *notmuch,
\r
68 + const char *format,
\r
72 + const char *message;
\r
74 + va_start (va_args, format);
\r
76 + vlog_to_string (notmuch, ¬much->status_string, format, va_args);
\r
82 find_doc_ids_for_term (notmuch_database_t *notmuch,
\r
84 diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
\r
85 index 012ad25..7c6cfc0 100644
\r
86 --- a/lib/notmuch-private.h
\r
87 +++ b/lib/notmuch-private.h
\r
88 @@ -191,6 +191,10 @@ _notmuch_message_id_compressed (void *ctx, const char *message_id);
\r
90 _notmuch_database_ensure_writable (notmuch_database_t *notmuch);
\r
93 +_notmuch_database_log (notmuch_database_t *notmuch,
\r
94 + const char *format, ...);
\r
97 _notmuch_database_relative_path (notmuch_database_t *notmuch,
\r