diff options
| author | David Bremner <david@tethera.net> | 2016-07-15 07:25:41 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-08-09 09:34:11 +0900 |
| commit | 293186d6c6b1c4d158413de5412e6b4345e94970 (patch) | |
| tree | 483440c0ef66a669f559f2fe30273a965122f1f2 /lib | |
| parent | f45fa5bdd397d52473f7092f7ae3e2ffb9b7aee5 (diff) | |
lib: provide _notmuch_database_log_append
_notmuch_database_log clears the log buffer each time. Rather than
introducing more complicated semantics about for this function, provide
a second function that does not clear the buffer. This is mainly a
convenience function for callers constructing complex or multi-line log
messages.
The changes to query.cc are to make sure that the common code path of
the new function is tested.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/database.cc | 16 | ||||
| -rw-r--r-- | lib/notmuch-private.h | 4 | ||||
| -rw-r--r-- | lib/query.cc | 14 |
3 files changed, 28 insertions, 6 deletions
diff --git a/lib/database.cc b/lib/database.cc index 66ee267f..57a98c94 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -383,6 +383,22 @@ _notmuch_database_log (notmuch_database_t *notmuch, talloc_free (notmuch->status_string); notmuch->status_string = talloc_vasprintf (notmuch, format, va_args); + va_end (va_args); +} + +void +_notmuch_database_log_append (notmuch_database_t *notmuch, + const char *format, + ...) +{ + va_list va_args; + + va_start (va_args, format); + + if (notmuch->status_string) + notmuch->status_string = talloc_vasprintf_append (notmuch->status_string, format, va_args); + else + notmuch->status_string = talloc_vasprintf (notmuch, format, va_args); va_end (va_args); } diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 3721431e..643d9dd9 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -196,6 +196,10 @@ void _notmuch_database_log (notmuch_database_t *notmuch, const char *format, ...); +void +_notmuch_database_log_append (notmuch_database_t *notmuch, + const char *format, ...); + unsigned long _notmuch_database_new_revision (notmuch_database_t *notmuch); diff --git a/lib/query.cc b/lib/query.cc index 7eb73a13..53efd4e1 100644 --- a/lib/query.cc +++ b/lib/query.cc @@ -299,9 +299,10 @@ _notmuch_query_search_documents (notmuch_query_t *query, } catch (const Xapian::Error &error) { _notmuch_database_log (notmuch, - "A Xapian exception occurred performing query: %s\n" + "A Xapian exception occurred performing query: %s\n", + error.get_msg().c_str()); + _notmuch_database_log_append (notmuch, "Query string was: %s\n", - error.get_msg().c_str(), query->query_string); notmuch->exception_reported = TRUE; @@ -613,10 +614,11 @@ _notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsign } catch (const Xapian::Error &error) { _notmuch_database_log (notmuch, - "A Xapian exception occurred performing query: %s\n" - "Query string was: %s\n", - error.get_msg().c_str(), - query->query_string); + "A Xapian exception occurred performing query: %s\n", + error.get_msg().c_str()); + _notmuch_database_log_append (notmuch, + "Query string was: %s\n", + query->query_string); return NOTMUCH_STATUS_XAPIAN_EXCEPTION; } |