I have two questions, both of which might have been settled previously. > > - return notmuch; > + *database = notmuch; > + return status; > } Should we check database is non-NULL here? > diff --git a/notmuch-count.c b/notmuch-count.c > index 9c2ad7b..2f98128 100644 > --- a/notmuch-count.c > +++ b/notmuch-count.c > + if (notmuch_database_open (notmuch_config_get_database_path (config), > + NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) Is it OK to rely on NOTMUCH_STATUS_SUCCESS==0 ? d