From 4185e0af3aed33e80f94786ae4b760d35be9052d Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 14 Mar 2015 18:02:30 +0100 Subject: [PATCH] [Patch v4 5/9] lib/database: add field for last error string --- 1d/3ffd24dca9e2c3ab3f435e2b627313934427c2 | 115 ++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 1d/3ffd24dca9e2c3ab3f435e2b627313934427c2 diff --git a/1d/3ffd24dca9e2c3ab3f435e2b627313934427c2 b/1d/3ffd24dca9e2c3ab3f435e2b627313934427c2 new file mode 100644 index 000000000..7d11a3cc2 --- /dev/null +++ b/1d/3ffd24dca9e2c3ab3f435e2b627313934427c2 @@ -0,0 +1,115 @@ +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 8416C429E26 + for ; Sat, 14 Mar 2015 10:05:14 -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 mfCIvlBhkBo8 for ; + Sat, 14 Mar 2015 10:05:13 -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 895D8429E2E + for ; Sat, 14 Mar 2015 10:05:12 -0700 (PDT) +Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim + 4.80) (envelope-from ) + id 1YWpUC-00028e-Cn; Sat, 14 Mar 2015 17:04:28 +0000 +Received: (nullmailer pid 4989 invoked by uid 1000); Sat, 14 Mar 2015 + 17:02:41 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v4 5/9] lib/database: add field for last error string +Date: Sat, 14 Mar 2015 18:02:30 +0100 +Message-Id: <1426352554-4383-6-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1426352554-4383-1-git-send-email-david@tethera.net> +References: <1426352554-4383-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, 14 Mar 2015 17:05:14 -0000 + +The idea is to have a logging function setting this string instead of +printing to stderr. +--- + lib/database-private.h | 4 ++++ + lib/database.cc | 7 +++++++ + lib/notmuch.h | 7 +++++++ + 3 files changed, 18 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 b774edc..48a830f 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -873,6 +873,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] == '/') +@@ -2558,3 +2559,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.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