[Patch v3 5/6] lib: replace almost all fprintfs in library with _n_d_log
This is not supposed to change any functionality from an end user
point of view. Note that it will eliminate some output to stderr. The
query debugging output is left as is; it doesn't really fit with the
current primitive logging model. The remaining "bad" fprintf will need
an internal API change.
---
lib/database.cc | 34 +-
lib/directory.cc | 4 ++--
lib/index.cc | 11 +++
lib/message.cc | 6 +++---
lib/query.cc | 8
5 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index 9af1a47..19f5f0e 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -493,7 +493,7 @@ notmuch_database_find_message (notmuch_database_t *notmuch,
return NOTMUCH_STATUS_SUCCESS;
} catch (const Xapian::Error ) {
- fprintf (stderr, "A Xapian exception occurred finding message: %s.\n",
+ _notmuch_database_log (notmuch, "A Xapian exception occurred finding
message: %s.\n",
error.get_msg().c_str());
notmuch->exception_reported = TRUE;
*message_ret = NULL;
@@ -725,7 +725,7 @@ notmuch_status_t
_notmuch_database_ensure_writable (notmuch_database_t *notmuch)
{
if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) {
- fprintf (stderr, "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;
}
@@ -1010,7 +1010,7 @@ notmuch_database_close (notmuch_database_t *notmuch)
} catch (const Xapian::Error ) {
status = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
if (! notmuch->exception_reported) {
- fprintf (stderr, "Error: A Xapian exception occurred closing
database: %s\n",
+ _notmuch_database_log (notmuch, "Error: A Xapian exception
occurred closing database: %s\n",
error.get_msg().c_str());
}
}
@@ -1142,12 +1142,12 @@ notmuch_database_compact (const char *path,
}
if (stat (backup_path, ) != -1) {
- fprintf (stderr, "Path already exists: %s\n", backup_path);
+ _notmuch_database_log (notmuch, "Path already exists: %s\n",
backup_path);
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
if (errno != ENOENT) {
- fprintf (stderr, "Unknown error while stat()ing path: %s\n",
+ _notmuch_database_log (notmuch, "Unknown error while stat()ing path:
%s\n",
strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
@@ -1167,20 +1167,20 @@ notmuch_database_compact (const char *path,
compactor.set_destdir (compact_xapian_path);
compactor.compact ();
} catch (const Xapian::Error ) {
- fprintf (stderr, "Error while compacting: %s\n",
error.get_msg().c_str());
+ _notmuch_database_log (notmuch, "Error while compacting: %s\n",
error.get_msg().c_str());
ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
goto DONE;
}
if (rename (xapian_path, backup_path)) {
- fprintf (stderr, "Error moving %s to %s: %s\n",
+ _notmuch_database_log (notmuch, "Error moving %s to %s: %s\n",
xapian_path, backup_path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
if (rename (compact_xapian_path, xapian_path)) {
- fprintf (stderr, "Error moving %s to %s: %s\n",
+ _notmuch_database_log (notmuch, "Error moving %s to %s: %s\n",
compact_xapian_path, xapian_path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
@@ -1188,7 +1188,7 @@ notmuch_database_compact (const char *path,
if (! keep_backup) {
if (rmtree (backup_path)) {
- fprintf (stderr, "Error removing old database %s: %s\n",
+ _notmuch_database_log (notmuch, "Error removing old database %s:
%s\n",
backup_path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
@@ -1217,7 +1217,7 @@ notmuch_database_compact (unused (const char *path),
unused (notmuch_compact_status_cb_t status_cb),
unused (void *closure))
{
-fprintf (stderr, "notmuch was compiled against a xapian version lacking
compaction support.\n");
+_notmuch_database_log (notmuch, "notmuch was compiled against a xapian
version lacking compaction support.\n");
return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;
}
#endif
@@ -1495,7 +1495,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
}
if (private_status) {
- fprintf (stderr,
+ _notmuch_database_log (notmuch,
"Upgrade failed while creating ghost messages.\n");
status = COERCE_STATUS (private_status, "Unexpected status from
_notmuch_message_initialize_ghost");
goto DONE;
@@ -1545,7 +1545,7 @@
[Patch v3 5/6] lib: replace almost all fprintfs in library with _n_d_log
This is not supposed to change any functionality from an end user
point of view. Note that it will eliminate some output to stderr. The
query debugging output is left as is; it doesn't really fit with the
current primitive logging model. The remaining bad fprintf will need
an internal API change.
---
lib/database.cc | 34 +-
lib/directory.cc | 4 ++--
lib/index.cc | 11 +++
lib/message.cc | 6 +++---
lib/query.cc | 8
5 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index 9af1a47..19f5f0e 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -493,7 +493,7 @@ notmuch_database_find_message (notmuch_database_t *notmuch,
return NOTMUCH_STATUS_SUCCESS;
} catch (const Xapian::Error error) {
- fprintf (stderr, A Xapian exception occurred finding message: %s.\n,
+ _notmuch_database_log (notmuch, A Xapian exception occurred finding
message: %s.\n,
error.get_msg().c_str());
notmuch-exception_reported = TRUE;
*message_ret = NULL;
@@ -725,7 +725,7 @@ notmuch_status_t
_notmuch_database_ensure_writable (notmuch_database_t *notmuch)
{
if (notmuch-mode == NOTMUCH_DATABASE_MODE_READ_ONLY) {
- fprintf (stderr, 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;
}
@@ -1010,7 +1010,7 @@ notmuch_database_close (notmuch_database_t *notmuch)
} catch (const Xapian::Error error) {
status = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
if (! notmuch-exception_reported) {
- fprintf (stderr, Error: A Xapian exception occurred closing
database: %s\n,
+ _notmuch_database_log (notmuch, Error: A Xapian exception
occurred closing database: %s\n,
error.get_msg().c_str());
}
}
@@ -1142,12 +1142,12 @@ notmuch_database_compact (const char *path,
}
if (stat (backup_path, statbuf) != -1) {
- fprintf (stderr, Path already exists: %s\n, backup_path);
+ _notmuch_database_log (notmuch, Path already exists: %s\n,
backup_path);
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
if (errno != ENOENT) {
- fprintf (stderr, Unknown error while stat()ing path: %s\n,
+ _notmuch_database_log (notmuch, Unknown error while stat()ing path:
%s\n,
strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
@@ -1167,20 +1167,20 @@ notmuch_database_compact (const char *path,
compactor.set_destdir (compact_xapian_path);
compactor.compact ();
} catch (const Xapian::Error error) {
- fprintf (stderr, Error while compacting: %s\n,
error.get_msg().c_str());
+ _notmuch_database_log (notmuch, Error while compacting: %s\n,
error.get_msg().c_str());
ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
goto DONE;
}
if (rename (xapian_path, backup_path)) {
- fprintf (stderr, Error moving %s to %s: %s\n,
+ _notmuch_database_log (notmuch, Error moving %s to %s: %s\n,
xapian_path, backup_path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
if (rename (compact_xapian_path, xapian_path)) {
- fprintf (stderr, Error moving %s to %s: %s\n,
+ _notmuch_database_log (notmuch, Error moving %s to %s: %s\n,
compact_xapian_path, xapian_path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
@@ -1188,7 +1188,7 @@ notmuch_database_compact (const char *path,
if (! keep_backup) {
if (rmtree (backup_path)) {
- fprintf (stderr, Error removing old database %s: %s\n,
+ _notmuch_database_log (notmuch, Error removing old database %s:
%s\n,
backup_path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
@@ -1217,7 +1217,7 @@ notmuch_database_compact (unused (const char *path),
unused (notmuch_compact_status_cb_t status_cb),
unused (void *closure))
{
-fprintf (stderr, notmuch was compiled against a xapian version lacking
compaction support.\n);
+_notmuch_database_log (notmuch, notmuch was compiled against a xapian
version lacking compaction support.\n);
return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;
}
#endif
@@ -1495,7 +1495,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
}
if (private_status) {
- fprintf (stderr,
+ _notmuch_database_log (notmuch,
Upgrade failed while creating ghost messages.\n);
status = COERCE_STATUS (private_status, Unexpected status from
_notmuch_message_initialize_ghost);
goto DONE;
@@ -1545,7 +1545,7 @@
