On Wed, Mar 30 2016, David Bremner <david@tethera.net> wrote: > This could probably be used at quite a few places in the existing code, > but in the immediate future I plan to use in some new code in > notmuch-dump > --- > notmuch-client.h | 5 +++++ > status.c | 17 +++++++++++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/notmuch-client.h b/notmuch-client.h > index 18e6c60..b3d0b66 100644 > --- a/notmuch-client.h > +++ b/notmuch-client.h > @@ -462,6 +462,11 @@ print_status_query (const char *loc, > const notmuch_query_t *query, > notmuch_status_t status); > > +notmuch_status_t > +print_status_database (const char *loc, > + const notmuch_database_t *database, > + notmuch_status_t status); > + > #include "command-line-arguments.h" > > extern char *notmuch_requested_db_uuid; > diff --git a/status.c b/status.c > index 8fa81cb..45d3fb4 100644 > --- a/status.c > +++ b/status.c > @@ -19,3 +19,20 @@ print_status_query (const char *loc, > } > return status; > } > + > +notmuch_status_t > +print_status_database (const char *loc, > + const notmuch_database_t *notmuch, > + notmuch_status_t status) > +{ > + if (status) { > + const char *msg; > + > + fprintf (stderr, "%s: %s\n", loc, > + notmuch_status_to_string (status)); > + msg = notmuch_database_status_string (notmuch); > + if (msg) > + fputs (msg, stderr); > + } > + return status; LGTM (whole series). I was going to complain about the naming of 'print_status_database()' but David already got through (in 39c54df2) print_status_query() so that ship sailed already (perhaps that it happened is good :). > +} > -- > 2.8.0.rc3