debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: encapsulate the use of notmuch_database_t field 'mode'

Browse source 
The plan is to change the underlying representation.
This commit is contained in:
David Bremner 2020-07-26 20:31:35 -03:00
parent c73d510f96
commit d7d4c729ab
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/database.cc
View file

@ -69,6 +69,12 @@ _log_xapian_exception (const char *where, notmuch_database_t *notmuch, const Xa
notmuch->exception_reported = true; 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): /* Here's the current schema for our database (for NOTMUCH_DATABASE_VERSION):
* *
* We currently have three different types of documents (mail, ghost, * 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_status_t
_notmuch_database_ensure_writable (notmuch_database_t *notmuch) _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"); _notmuch_database_log (notmuch, "Cannot write to a read-only database.\n");
return NOTMUCH_STATUS_READ_ONLY_DATABASE; return NOTMUCH_STATUS_READ_ONLY_DATABASE;
} }
@ -1107,7 +1113,7 @@ notmuch_database_close (notmuch_database_t *notmuch)
* that transaction, or may discard committed (but * that transaction, or may discard committed (but
* unflushed) transactions. To be certain, explicitly * unflushed) transactions. To be certain, explicitly
* cancel any outstanding transaction before closing. */ * 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) notmuch->atomic_nesting)
(static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db)) (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))
->cancel_transaction (); ->cancel_transaction ();
@ -1130,7 +1136,7 @@ notmuch_database_close (notmuch_database_t *notmuch)
notmuch_status_t notmuch_status_t
_notmuch_database_reopen (notmuch_database_t *notmuch) _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; return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;
try { try {
@ -1395,7 +1401,7 @@ notmuch_database_needs_upgrade (notmuch_database_t *notmuch)
{ {
unsigned int version; unsigned int version;
if (notmuch->mode != NOTMUCH_DATABASE_MODE_READ_WRITE) if (_notmuch_database_mode (notmuch) != NOTMUCH_DATABASE_MODE_READ_WRITE)
return FALSE; return FALSE;
if (NOTMUCH_FEATURES_CURRENT & ~notmuch->features) if (NOTMUCH_FEATURES_CURRENT & ~notmuch->features)
@ -1697,7 +1703,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
notmuch_status_t notmuch_status_t
notmuch_database_begin_atomic (notmuch_database_t *notmuch) 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) notmuch->atomic_nesting > 0)
goto DONE; goto DONE;
@ -1726,7 +1732,7 @@ notmuch_database_end_atomic (notmuch_database_t *notmuch)
if (notmuch->atomic_nesting == 0) if (notmuch->atomic_nesting == 0)
return NOTMUCH_STATUS_UNBALANCED_ATOMIC; 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) notmuch->atomic_nesting > 1)
goto DONE; goto DONE;

2
lib/directory.cc
View file

@ -114,7 +114,7 @@ _notmuch_directory_find_or_create (notmuch_database_t *notmuch,
path = _notmuch_database_relative_path (notmuch, path); 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"); INTERNAL_ERROR ("Failure to ensure database is writable");
directory = talloc (notmuch, notmuch_directory_t); directory = talloc (notmuch, notmuch_directory_t);

4
lib/message.cc
View file

@ -275,7 +275,7 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
return NULL; 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."); INTERNAL_ERROR ("Failure to ensure database is writable.");
try { try {
@ -1324,7 +1324,7 @@ _notmuch_message_sync (notmuch_message_t *message)
{ {
Xapian::WritableDatabase *db; Xapian::WritableDatabase *db;
if (message->notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) if (_notmuch_database_mode (message->notmuch) == NOTMUCH_DATABASE_MODE_READ_ONLY)
return; return;
if (! message->modified) if (! message->modified)

3
lib/notmuch-private.h
View file

@ -259,6 +259,9 @@ _notmuch_directory_find_or_create (notmuch_database_t *notmuch,
unsigned int unsigned int
_notmuch_directory_get_document_id (notmuch_directory_t *directory); _notmuch_directory_get_document_id (notmuch_directory_t *directory);
notmuch_database_mode_t
_notmuch_database_mode (notmuch_database_t *notmuch);
/* message.cc */ /* message.cc */
notmuch_message_t * notmuch_message_t *