diff options
| author |  Carl Worth <cworth@cworth.org> | 2009-11-21 22:10:18 +0100 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2009-11-21 22:10:18 +0100 |
| commit | 637f99d8f3f45867d0a856503f9f302333824c07 (patch) | |
| tree | 725fe7c08aa5ac076616e7f8dab8a4c0063ed221 /lib | |
| parent | f379aa52845f5594aa6cc2e7cf131d5f57202bbf (diff) | |
Rename NOTMUCH_DATABASE_MODE_WRITABLE to NOTMUCH_DATABASE_MODE_READ_WRITE
And correspondingly, READONLY to READ_ONLY.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/database.cc | 8 | ||||
| -rw-r--r-- | lib/message.cc | 4 | ||||
| -rw-r--r-- | lib/notmuch.h | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lib/database.cc b/lib/database.cc index fb386647..95057a8f 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -441,7 +441,7 @@ notmuch_database_create (const char *path) } notmuch = notmuch_database_open (path, - NOTMUCH_DATABASE_MODE_WRITABLE); + NOTMUCH_DATABASE_MODE_READ_WRITE); DONE: if (notmuch_path) @@ -487,7 +487,7 @@ notmuch_database_open (const char *path, notmuch->mode = mode; try { - if (mode == NOTMUCH_DATABASE_MODE_WRITABLE) { + if (mode == NOTMUCH_DATABASE_MODE_READ_WRITE) { notmuch->xapian_db = new Xapian::WritableDatabase (xapian_path, Xapian::DB_CREATE_OR_OPEN); } else { @@ -530,7 +530,7 @@ notmuch_database_open (const char *path, void notmuch_database_close (notmuch_database_t *notmuch) { - if (notmuch->mode == NOTMUCH_DATABASE_MODE_WRITABLE) + if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE) (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush (); delete notmuch->term_gen; @@ -583,7 +583,7 @@ notmuch_database_set_timestamp (notmuch_database_t *notmuch, notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; char *db_key = NULL; - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READONLY) { + if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) { fprintf (stderr, "Attempted to update a read-only database.\n"); return NOTMUCH_STATUS_READONLY_DATABASE; } diff --git a/lib/message.cc b/lib/message.cc index 7ba06c99..069cedb2 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -172,7 +172,7 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch, unsigned int doc_id; char *term; - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READONLY) { + if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) { *status_ret = NOTMUCH_PRIVATE_STATUS_READONLY_DATABASE; return NULL; } @@ -552,7 +552,7 @@ _notmuch_message_sync (notmuch_message_t *message) { Xapian::WritableDatabase *db; - if (message->notmuch->mode == NOTMUCH_DATABASE_MODE_READONLY) + if (message->notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) return; db = static_cast <Xapian::WritableDatabase *> (message->notmuch->xapian_db); diff --git a/lib/notmuch.h b/lib/notmuch.h index 89ed7ad8..bbeec559 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -137,14 +137,14 @@ typedef struct _notmuch_tags notmuch_tags_t; notmuch_database_t * notmuch_database_create (const char *path); -/* XXX: I think I'd like this to take an extra argument of - * notmuch_status_t* for returning a status value on failure. */ - typedef enum { - NOTMUCH_DATABASE_MODE_READONLY = 0, - NOTMUCH_DATABASE_MODE_WRITABLE + NOTMUCH_DATABASE_MODE_READ_ONLY = 0, + NOTMUCH_DATABASE_MODE_READ_Write } notmuch_database_mode_t; +/* XXX: I think I'd like this to take an extra argument of + * notmuch_status_t* for returning a status value on failure. */ + /* Open an existing notmuch database located at 'path'. * * The database should have been created at some time in the past, |