From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mIMkM3ESHl9yIAAA0tVLHw (envelope-from ) for ; Sun, 26 Jul 2020 23:32:01 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id YALdLnESHl+KewAAbx9fmQ (envelope-from ) for ; Sun, 26 Jul 2020 23:32:01 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 24A589400C7 for ; Sun, 26 Jul 2020 23:32:00 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id B2401200A5; Sun, 26 Jul 2020 19:31:49 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id B08631F9C9 for ; Sun, 26 Jul 2020 19:31:46 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 60D1F60ABA; Sun, 26 Jul 2020 19:31:46 -0400 (EDT) Received: (nullmailer pid 1638991 invoked by uid 1000); Sun, 26 Jul 2020 23:31:43 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 2/3] lib: encapsulate the use of notmuch_database_t field 'mode' Date: Sun, 26 Jul 2020 20:31:35 -0300 Message-Id: <20200726233136.1636807-3-david@tethera.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200726233136.1636807-1-david@tethera.net> References: <20200726233136.1636807-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: PM4HIEDEGZUYQF53PSUO6J3ZJO5VRXL7 X-Message-ID-Hash: PM4HIEDEGZUYQF53PSUO6J3ZJO5VRXL7 X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 1.53 X-TUID: lF8PJJ3p4e84 The plan is to change the underlying representation. --- lib/database.cc | 18 ++++++++++++------ lib/directory.cc | 2 +- lib/message.cc | 4 ++-- lib/notmuch-private.h | 3 +++ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index b987cb42..08278235 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -69,6 +69,12 @@ _log_xapian_exception (const char *where, notmuch_database_t *notmuch, const Xa notmuch->exception_reported = true; } +notmuch_database_mode_t +_notmuch_database_mode (notmuch_database_t *notmuch) +{ + return notmuch->mode; +} + /* Here's the current schema for our database (for NOTMUCH_DATABASE_VERSION): * * We currently have three different types of documents (mail, ghost, @@ -783,7 +789,7 @@ notmuch_database_create_verbose (const char *path, notmuch_status_t _notmuch_database_ensure_writable (notmuch_database_t *notmuch) { - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) { + if (_notmuch_database_mode (notmuch) == NOTMUCH_DATABASE_MODE_READ_ONLY) { _notmuch_database_log (notmuch, "Cannot write to a read-only database.\n"); return NOTMUCH_STATUS_READ_ONLY_DATABASE; } @@ -1107,7 +1113,7 @@ notmuch_database_close (notmuch_database_t *notmuch) * that transaction, or may discard committed (but * unflushed) transactions. To be certain, explicitly * cancel any outstanding transaction before closing. */ - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE && + if (_notmuch_database_mode (notmuch) == NOTMUCH_DATABASE_MODE_READ_WRITE && notmuch->atomic_nesting) (static_cast (notmuch->xapian_db)) ->cancel_transaction (); @@ -1130,7 +1136,7 @@ notmuch_database_close (notmuch_database_t *notmuch) notmuch_status_t _notmuch_database_reopen (notmuch_database_t *notmuch) { - if (notmuch->mode != NOTMUCH_DATABASE_MODE_READ_ONLY) + if (_notmuch_database_mode (notmuch) != NOTMUCH_DATABASE_MODE_READ_ONLY) return NOTMUCH_STATUS_UNSUPPORTED_OPERATION; try { @@ -1395,7 +1401,7 @@ notmuch_database_needs_upgrade (notmuch_database_t *notmuch) { unsigned int version; - if (notmuch->mode != NOTMUCH_DATABASE_MODE_READ_WRITE) + if (_notmuch_database_mode (notmuch) != NOTMUCH_DATABASE_MODE_READ_WRITE) return FALSE; if (NOTMUCH_FEATURES_CURRENT & ~notmuch->features) @@ -1697,7 +1703,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch, notmuch_status_t notmuch_database_begin_atomic (notmuch_database_t *notmuch) { - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY || + if (_notmuch_database_mode (notmuch) == NOTMUCH_DATABASE_MODE_READ_ONLY || notmuch->atomic_nesting > 0) goto DONE; @@ -1726,7 +1732,7 @@ notmuch_database_end_atomic (notmuch_database_t *notmuch) if (notmuch->atomic_nesting == 0) return NOTMUCH_STATUS_UNBALANCED_ATOMIC; - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY || + if (_notmuch_database_mode (notmuch) == NOTMUCH_DATABASE_MODE_READ_ONLY || notmuch->atomic_nesting > 1) goto DONE; diff --git a/lib/directory.cc b/lib/directory.cc index 044cd680..9ad66e82 100644 --- a/lib/directory.cc +++ b/lib/directory.cc @@ -127,7 +127,7 @@ _notmuch_directory_find_or_create (notmuch_database_t *notmuch, path = _notmuch_database_relative_path (notmuch, path); - if (create && notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) + if (create && _notmuch_database_mode (notmuch) == NOTMUCH_DATABASE_MODE_READ_ONLY) INTERNAL_ERROR ("Failure to ensure database is writable"); directory = talloc (notmuch, notmuch_directory_t); diff --git a/lib/message.cc b/lib/message.cc index 64798413..d23e64ab 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -275,7 +275,7 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch, return NULL; } - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) + if (_notmuch_database_mode (notmuch) == NOTMUCH_DATABASE_MODE_READ_ONLY) INTERNAL_ERROR ("Failure to ensure database is writable."); try { @@ -1324,7 +1324,7 @@ _notmuch_message_sync (notmuch_message_t *message) { Xapian::WritableDatabase *db; - if (message->notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) + if (_notmuch_database_mode (message->notmuch) == NOTMUCH_DATABASE_MODE_READ_ONLY) return; if (! message->modified) diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 2bbbb293..57ec7f72 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -259,6 +259,9 @@ _notmuch_directory_find_or_create (notmuch_database_t *notmuch, unsigned int _notmuch_directory_get_document_id (notmuch_directory_t *directory); +notmuch_database_mode_t +_notmuch_database_mode (notmuch_database_t *notmuch); + /* message.cc */ notmuch_message_t * -- 2.27.0