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

lib: provide _notmuch_database_log_append

Browse source 
_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.
This commit is contained in:
David Bremner 2016-07-15 07:25:41 -03:00
parent f45fa5bdd3
commit 293186d6c6
3 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/database.cc
View file

@ -383,6 +383,22 @@ _notmuch_database_log (notmuch_database_t *notmuch,
talloc_free (notmuch->status_string); talloc_free (notmuch->status_string);
notmuch->status_string = talloc_vasprintf (notmuch, format, va_args); 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); va_end (va_args);
} }

4
lib/notmuch-private.h
View file

@ -196,6 +196,10 @@ void
_notmuch_database_log (notmuch_database_t *notmuch, _notmuch_database_log (notmuch_database_t *notmuch,
const char *format, ...); const char *format, ...);
void
_notmuch_database_log_append (notmuch_database_t *notmuch,
const char *format, ...);
unsigned long unsigned long
_notmuch_database_new_revision (notmuch_database_t *notmuch); _notmuch_database_new_revision (notmuch_database_t *notmuch);

14
lib/query.cc
View file

@ -299,9 +299,10 @@ _notmuch_query_search_documents (notmuch_query_t *query,
} catch (const Xapian::Error &error) { } catch (const Xapian::Error &error) {
_notmuch_database_log (notmuch, _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", "Query string was: %s\n",
error.get_msg().c_str(),
query->query_string); query->query_string);
notmuch->exception_reported = TRUE; 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) { } catch (const Xapian::Error &error) {
_notmuch_database_log (notmuch, _notmuch_database_log (notmuch,
"A Xapian exception occurred performing query: %s\n" "A Xapian exception occurred performing query: %s\n",
"Query string was: %s\n", error.get_msg().c_str());
error.get_msg().c_str(), _notmuch_database_log_append (notmuch,
query->query_string); "Query string was: %s\n",
query->query_string);
return NOTMUCH_STATUS_XAPIAN_EXCEPTION; return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
} }