From 2719f79ade69f2c8080d4774fbb7afc7320de2fa Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 27 Mar 2015 23:11:57 +0100 Subject: [PATCH] [Patch v6 5/8] lib: add a log function with output to a string in notmuch_database_t --- c1/4c8a7de92f9f0d777544d49dc33730fc4bba7a | 156 ++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 c1/4c8a7de92f9f0d777544d49dc33730fc4bba7a diff --git a/c1/4c8a7de92f9f0d777544d49dc33730fc4bba7a b/c1/4c8a7de92f9f0d777544d49dc33730fc4bba7a new file mode 100644 index 000000000..e68659cf4 --- /dev/null +++ b/c1/4c8a7de92f9f0d777544d49dc33730fc4bba7a @@ -0,0 +1,156 @@ +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 E9071429E26 + for ; Fri, 27 Mar 2015 15:13:33 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.438 +X-Spam-Level: ** +X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 + tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 njCe+Yn+oBEt for ; + Fri, 27 Mar 2015 15:13:32 -0700 (PDT) +Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net + [87.98.215.224]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 0615E429E25 + for ; Fri, 27 Mar 2015 15:13:32 -0700 (PDT) +Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim + 4.80) (envelope-from ) + id 1YbcUj-0000EZ-0f; Fri, 27 Mar 2015 22:12:49 +0000 +Received: (nullmailer pid 1815 invoked by uid 1000); Fri, 27 Mar 2015 + 22:12:15 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v6 5/8] lib: add a log function with output to a string in + notmuch_database_t +Date: Fri, 27 Mar 2015 23:11:57 +0100 +Message-Id: <1427494320-1483-6-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1427494320-1483-1-git-send-email-david@tethera.net> +References: <1427494320-1483-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: Fri, 27 Mar 2015 22:13:34 -0000 + +In principle in the future this could do something fancier than +asprintf. +--- + lib/database-private.h | 4 ++++ + lib/database.cc | 24 ++++++++++++++++++++++++ + lib/notmuch-private.h | 4 ++++ + lib/notmuch.h | 7 +++++++ + 4 files changed, 39 insertions(+) + +diff --git a/lib/database-private.h b/lib/database-private.h +index 6d6fa2c..24243db 100644 +--- a/lib/database-private.h ++++ b/lib/database-private.h +@@ -154,6 +154,10 @@ struct _notmuch_database { + unsigned int last_doc_id; + uint64_t last_thread_id; + ++ /* error reporting; this value persists only until the ++ * next library call. May be NULL */ ++ char *status_string; ++ + Xapian::QueryParser *query_parser; + Xapian::TermGenerator *term_gen; + Xapian::ValueRangeProcessor *value_range_processor; +diff --git a/lib/database.cc b/lib/database.cc +index 5d973b9..c114765 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -348,6 +348,23 @@ notmuch_status_to_string (notmuch_status_t status) + } + } + ++void ++_notmuch_database_log (notmuch_database_t *notmuch, ++ const char *format, ++ ...) ++{ ++ va_list va_args; ++ ++ va_start (va_args, format); ++ ++ if (notmuch->status_string) ++ talloc_free (notmuch->status_string); ++ ++ notmuch->status_string = talloc_vasprintf (notmuch, format, va_args); ++ ++ va_end (va_args); ++} ++ + static void + find_doc_ids_for_term (notmuch_database_t *notmuch, + const char *term, +@@ -860,6 +877,7 @@ notmuch_database_open_verbose (const char *path, + + notmuch = talloc_zero (NULL, notmuch_database_t); + notmuch->exception_reported = FALSE; ++ notmuch->status_string = NULL; + notmuch->path = talloc_strdup (notmuch, path); + + if (notmuch->path[strlen (notmuch->path) - 1] == '/') +@@ -2545,3 +2563,9 @@ notmuch_database_get_all_tags (notmuch_database_t *db) + return NULL; + } + } ++ ++const char * ++notmuch_database_status_string (notmuch_database_t *notmuch) ++{ ++ return notmuch->status_string; ++} +diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h +index 8a1f2fa..7cb6fd4 100644 +--- a/lib/notmuch-private.h ++++ b/lib/notmuch-private.h +@@ -190,6 +190,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); +diff --git a/lib/notmuch.h b/lib/notmuch.h +index c671d82..20c4e01 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -302,6 +302,13 @@ notmuch_database_open_verbose (const char *path, + char **error_message); + + /** ++ * Retrieve last status string for given database. ++ * ++ */ ++const char * ++notmuch_database_status_string (notmuch_database_t *notmuch); ++ ++/** + * Commit changes and close the given notmuch database. + * + * After notmuch_database_close has been called, calls to other +-- +2.1.4 + -- 2.26.2