From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id BB74B6DE137E for ; Sat, 23 Jan 2016 07:00:15 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.31 X-Spam-Level: X-Spam-Status: No, score=-0.31 tagged_above=-999 required=5 tests=[AWL=0.241, RP_MATCHES_RCVD=-0.55, SPF_PASS=-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 vqXm5to8E83s for ; Sat, 23 Jan 2016 07:00:14 -0800 (PST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id A11736DE09ED for ; Sat, 23 Jan 2016 07:00:13 -0800 (PST) Received: from remotemail by fethera.tethera.net with local (Exim 4.84) (envelope-from ) id 1aMzf4-00016R-Du; Sat, 23 Jan 2016 09:59:34 -0500 Received: (nullmailer pid 4045 invoked by uid 1000); Sat, 23 Jan 2016 15:00:06 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 3/5] CLI: add print_status_database Date: Sat, 23 Jan 2016 10:59:56 -0400 Message-Id: <1453561198-2893-4-git-send-email-david@tethera.net> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1453561198-2893-1-git-send-email-david@tethera.net> References: <1453561198-2893-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, 23 Jan 2016 15:00:15 -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 3bd2903..7c9a1ea 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -459,6 +459,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