Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 9E7916DE02D0 for ; Sat, 26 Mar 2016 11:23:56 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.02 X-Spam-Level: X-Spam-Status: No, score=-0.02 tagged_above=-999 required=5 tests=[AWL=-0.021, HEADER_FROM_DIFFERENT_DOMAINS=0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4XoRpjCcZ7Bu for ; Sat, 26 Mar 2016 11:23:49 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 52AB76DE026C for ; Sat, 26 Mar 2016 11:23:23 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.84) (envelope-from ) id 1ajsTU-0000v3-Vp; Sat, 26 Mar 2016 13:58:13 -0400 Received: (nullmailer pid 8818 invoked by uid 1000); Sat, 26 Mar 2016 17:57:27 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [Patch v2 08/13] CLI: add print_status_database Date: Sat, 26 Mar 2016 14:57:18 -0300 Message-Id: <1459015043-8460-9-git-send-email-david@tethera.net> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1459015043-8460-1-git-send-email-david@tethera.net> References: <1459015043-8460-1-git-send-email-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Mar 2016 18:23:56 -0000 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; +} -- 2.6.4