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

Prefer READ_ONLY consistently over READONLY.

Browse source 
Previously we had NOTMUCH_DATABASE_MODE_READ_ONLY but
NOTMUCH_STATUS_READONLY_DATABASE which was ugly and confusing. Rename
the latter to NOTMUCH_STATUS_READ_ONLY_DATABASE for consistency.
This commit is contained in:
Carl Worth 2010-01-07 10:29:05 -08:00
parent f93b7218c3
commit 807aef93d3
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/database.cc
View file

@ -198,7 +198,7 @@ notmuch_status_to_string (notmuch_status_t status)
return "No error occurred"; return "No error occurred";
case NOTMUCH_STATUS_OUT_OF_MEMORY: case NOTMUCH_STATUS_OUT_OF_MEMORY:
return "Out of memory"; return "Out of memory";
case NOTMUCH_STATUS_READONLY_DATABASE: case NOTMUCH_STATUS_READ_ONLY_DATABASE:
return "Attempt to write to a read-only database"; return "Attempt to write to a read-only database";
case NOTMUCH_STATUS_XAPIAN_EXCEPTION: case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
return "A Xapian exception occurred"; return "A Xapian exception occurred";
@ -480,7 +480,7 @@ _notmuch_database_ensure_writable (notmuch_database_t *notmuch)
{ {
if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) { if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) {
fprintf (stderr, "Cannot write to a read-only database.\n"); fprintf (stderr, "Cannot write to a read-only database.\n");
return NOTMUCH_STATUS_READONLY_DATABASE; return NOTMUCH_STATUS_READ_ONLY_DATABASE;
} }
return NOTMUCH_STATUS_SUCCESS; return NOTMUCH_STATUS_SUCCESS;

2
lib/notmuch-private.h
View file

@ -112,7 +112,7 @@ typedef enum _notmuch_private_status {
/* First, copy all the public status values. */ /* First, copy all the public status values. */
NOTMUCH_PRIVATE_STATUS_SUCCESS = NOTMUCH_STATUS_SUCCESS, NOTMUCH_PRIVATE_STATUS_SUCCESS = NOTMUCH_STATUS_SUCCESS,
NOTMUCH_PRIVATE_STATUS_OUT_OF_MEMORY = NOTMUCH_STATUS_OUT_OF_MEMORY, NOTMUCH_PRIVATE_STATUS_OUT_OF_MEMORY = NOTMUCH_STATUS_OUT_OF_MEMORY,
NOTMUCH_PRIVATE_STATUS_READONLY_DATABASE = NOTMUCH_STATUS_READONLY_DATABASE, NOTMUCH_PRIVATE_STATUS_READ_ONLY_DATABASE = NOTMUCH_STATUS_READ_ONLY_DATABASE,
NOTMUCH_PRIVATE_STATUS_XAPIAN_EXCEPTION = NOTMUCH_STATUS_XAPIAN_EXCEPTION, NOTMUCH_PRIVATE_STATUS_XAPIAN_EXCEPTION = NOTMUCH_STATUS_XAPIAN_EXCEPTION,
NOTMUCH_PRIVATE_STATUS_FILE_NOT_EMAIL = NOTMUCH_STATUS_FILE_NOT_EMAIL, NOTMUCH_PRIVATE_STATUS_FILE_NOT_EMAIL = NOTMUCH_STATUS_FILE_NOT_EMAIL,
NOTMUCH_PRIVATE_STATUS_NULL_POINTER = NOTMUCH_STATUS_NULL_POINTER, NOTMUCH_PRIVATE_STATUS_NULL_POINTER = NOTMUCH_STATUS_NULL_POINTER,

20
lib/notmuch.h
View file

@ -57,8 +57,8 @@ typedef int notmuch_bool_t;
* value. Instead we should map to things like DATABASE_LOCKED or * value. Instead we should map to things like DATABASE_LOCKED or
* whatever. * whatever.
* *
* NOTMUCH_STATUS_READONLY_DATABASE: An attempt was made to write to a * NOTMUCH_STATUS_READ_ONLY_DATABASE: An attempt was made to write to
* database opened in read-only mode. * a database opened in read-only mode.
* *
* NOTMUCH_STATUS_XAPIAN_EXCEPTION: A Xapian exception occurred * NOTMUCH_STATUS_XAPIAN_EXCEPTION: A Xapian exception occurred
* *
@ -89,7 +89,7 @@ typedef int notmuch_bool_t;
typedef enum _notmuch_status { typedef enum _notmuch_status {
NOTMUCH_STATUS_SUCCESS = 0, NOTMUCH_STATUS_SUCCESS = 0,
NOTMUCH_STATUS_OUT_OF_MEMORY, NOTMUCH_STATUS_OUT_OF_MEMORY,
NOTMUCH_STATUS_READONLY_DATABASE, NOTMUCH_STATUS_READ_ONLY_DATABASE,
NOTMUCH_STATUS_XAPIAN_EXCEPTION, NOTMUCH_STATUS_XAPIAN_EXCEPTION,
NOTMUCH_STATUS_FILE_ERROR, NOTMUCH_STATUS_FILE_ERROR,
NOTMUCH_STATUS_FILE_NOT_EMAIL, NOTMUCH_STATUS_FILE_NOT_EMAIL,
@ -230,7 +230,7 @@ notmuch_database_get_directory (notmuch_database_t *database,
* NOTMUCH_STATUS_FILE_NOT_EMAIL: the contents of filename don't look * NOTMUCH_STATUS_FILE_NOT_EMAIL: the contents of filename don't look
* like an email message. Nothing added to the database. * like an email message. Nothing added to the database.
* *
* NOTMUCH_STATUS_READONLY_DATABASE: Database was opened in read-only * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only
* mode so no message can be added. * mode so no message can be added.
*/ */
notmuch_status_t notmuch_status_t
@ -256,7 +256,7 @@ notmuch_database_add_message (notmuch_database_t *database,
* the message persists in the database with at least one other * the message persists in the database with at least one other
* filename. * filename.
* *
* NOTMUCH_STATUS_READONLY_DATABASE: Database was opened in read-only * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only
* mode so no message can be removed. * mode so no message can be removed.
*/ */
notmuch_status_t notmuch_status_t
@ -796,7 +796,7 @@ notmuch_message_get_tags (notmuch_message_t *message);
* NOTMUCH_STATUS_TAG_TOO_LONG: The length of 'tag' is too long * NOTMUCH_STATUS_TAG_TOO_LONG: The length of 'tag' is too long
* (exceeds NOTMUCH_TAG_MAX) * (exceeds NOTMUCH_TAG_MAX)
* *
* NOTMUCH_STATUS_READONLY_DATABASE: Database was opened in read-only * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only
* mode so message cannot be modified. * mode so message cannot be modified.
*/ */
notmuch_status_t notmuch_status_t
@ -813,7 +813,7 @@ notmuch_message_add_tag (notmuch_message_t *message, const char *tag);
* NOTMUCH_STATUS_TAG_TOO_LONG: The length of 'tag' is too long * NOTMUCH_STATUS_TAG_TOO_LONG: The length of 'tag' is too long
* (exceeds NOTMUCH_TAG_MAX) * (exceeds NOTMUCH_TAG_MAX)
* *
* NOTMUCH_STATUS_READONLY_DATABASE: Database was opened in read-only * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only
* mode so message cannot be modified. * mode so message cannot be modified.
*/ */
notmuch_status_t notmuch_status_t
@ -824,7 +824,7 @@ notmuch_message_remove_tag (notmuch_message_t *message, const char *tag);
* See notmuch_message_freeze for an example showing how to safely * See notmuch_message_freeze for an example showing how to safely
* replace tag values. * replace tag values.
* *
* NOTMUCH_STATUS_READONLY_DATABASE: Database was opened in read-only * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only
* mode so message cannot be modified. * mode so message cannot be modified.
*/ */
notmuch_status_t notmuch_status_t
@ -867,7 +867,7 @@ notmuch_message_remove_all_tags (notmuch_message_t *message);
* *
* NOTMUCH_STATUS_SUCCESS: Message successfully frozen. * NOTMUCH_STATUS_SUCCESS: Message successfully frozen.
* *
* NOTMUCH_STATUS_READONLY_DATABASE: Database was opened in read-only * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only
* mode so message cannot be modified. * mode so message cannot be modified.
*/ */
notmuch_status_t notmuch_status_t
@ -980,7 +980,7 @@ notmuch_tags_destroy (notmuch_tags_t *tags);
* NOTMUCH_STATUS_XAPIAN_EXCEPTION: A Xapian exception * NOTMUCH_STATUS_XAPIAN_EXCEPTION: A Xapian exception
* occurred, mtime not stored. * occurred, mtime not stored.
* *
* NOTMUCH_STATUS_READONLY_DATABASE: Database was opened in read-only * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only
* mode so directory mtime cannot be modified. * mode so directory mtime cannot be modified.
*/ */
notmuch_status_t notmuch_status_t

2
notmuch-new.c
View file

@ -406,7 +406,7 @@ add_files_recursive (notmuch_database_t *notmuch,
next); next);
break; break;
/* Fatal issues. Don't process anymore. */ /* Fatal issues. Don't process anymore. */
case NOTMUCH_STATUS_READONLY_DATABASE: case NOTMUCH_STATUS_READ_ONLY_DATABASE:
case NOTMUCH_STATUS_XAPIAN_EXCEPTION: case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
case NOTMUCH_STATUS_OUT_OF_MEMORY: case NOTMUCH_STATUS_OUT_OF_MEMORY:
fprintf (stderr, "Error: %s. Halting processing.\n", fprintf (stderr, "Error: %s. Halting processing.\n",