From: David Bremner Date: Sat, 27 Dec 2014 22:05:34 +0000 (+0100) Subject: [PATCH v2 3/6] lib: add a log function with output to a string in notmuch_database_t X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f50544d5bd0cc54eeab47e8a0350f5174dcf0de9;p=notmuch-archives.git [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 index 000000000..f7871c66e --- /dev/null +++ b/dd/ffc86512989e07b2a877e33feb289a5bd26b38 @@ -0,0 +1,101 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id E9B5A429E30 + for ; Sat, 27 Dec 2014 14:05:56 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id UlURnNLgalEU for ; + Sat, 27 Dec 2014 14:05:54 -0800 (PST) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id AB5D1431FBC + for ; Sat, 27 Dec 2014 14:05:54 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1Y4zUf-0000DP-U5; Sat, 27 Dec 2014 18:05:53 -0400 +Received: (nullmailer pid 1477 invoked by uid 1000); Sat, 27 Dec 2014 + 22:05:48 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH v2 3/6] lib: add a log function with output to a string in + notmuch_database_t +Date: Sat, 27 Dec 2014 23:05:34 +0100 +Message-Id: <1419717937-1108-4-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.3 +In-Reply-To: <1419717937-1108-1-git-send-email-david@tethera.net> +References: <1419717937-1108-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 27 Dec 2014 22:05:57 -0000 + +This is a thin wrapper around the previously implemented string +logging infrastructure. In the future it could have more configurable +output options. +--- + lib/database.cc | 15 +++++++++++++++ + lib/notmuch-private.h | 4 ++++ + 2 files changed, 19 insertions(+) + +diff --git a/lib/database.cc b/lib/database.cc +index 249eb68..ee1c982 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -371,6 +371,21 @@ log_to_string (char **str, + va_end (va_args); + } + ++void ++_notmuch_database_log (notmuch_database_t *notmuch, ++ const char *format, ++ ...) ++{ ++ va_list va_args; ++ const char *message; ++ ++ va_start (va_args, format); ++ ++ vlog_to_string (notmuch, ¬much->status_string, format, va_args); ++ ++ va_end (va_args); ++} ++ + static void + find_doc_ids_for_term (notmuch_database_t *notmuch, + const char *term, +diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h +index 012ad25..7c6cfc0 100644 +--- a/lib/notmuch-private.h ++++ b/lib/notmuch-private.h +@@ -191,6 +191,10 @@ _notmuch_message_id_compressed (void *ctx, const char *message_id); + notmuch_status_t + _notmuch_database_ensure_writable (notmuch_database_t *notmuch); + ++void ++_notmuch_database_log (notmuch_database_t *notmuch, ++ const char *format, ...); ++ + const char * + _notmuch_database_relative_path (notmuch_database_t *notmuch, + const char *path); +-- +2.1.3 +