From 796da91c688d6866dea2d1d7efff1fdc60109b73 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 10 Jan 2016 22:51:39 +2000 Subject: [PATCH] [WIP patch 7/9] CLI: add print_status_database --- 4a/618bc226db9767b5c59f32f751b08bcda99cfe | 98 +++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 4a/618bc226db9767b5c59f32f751b08bcda99cfe diff --git a/4a/618bc226db9767b5c59f32f751b08bcda99cfe b/4a/618bc226db9767b5c59f32f751b08bcda99cfe new file mode 100644 index 000000000..07582d52e --- /dev/null +++ b/4a/618bc226db9767b5c59f32f751b08bcda99cfe @@ -0,0 +1,98 @@ +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 62AAE6DE1603 + for ; Sat, 9 Jan 2016 18:52:00 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.313 +X-Spam-Level: +X-Spam-Status: No, score=-0.313 tagged_above=-999 required=5 tests=[AWL=0.238, + 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 PEJxEJAzkTOZ for ; + Sat, 9 Jan 2016 18:51:58 -0800 (PST) +Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) + by arlo.cworth.org (Postfix) with ESMTPS id 83F256DE028A + for ; Sat, 9 Jan 2016 18:51:56 -0800 (PST) +Received: from remotemail by fethera.tethera.net with local (Exim 4.84) + (envelope-from ) + id 1aI66d-0007Di-2G; Sat, 09 Jan 2016 21:51:47 -0500 +Received: (nullmailer pid 29656 invoked by uid 1000); + Sun, 10 Jan 2016 02:51:47 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [WIP patch 7/9] CLI: add print_status_database +Date: Sat, 9 Jan 2016 22:51:39 -0400 +Message-Id: <1452394301-29499-8-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.6.4 +In-Reply-To: <1452394301-29499-1-git-send-email-david@tethera.net> +References: <1452394301-29499-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: Sun, 10 Jan 2016 02:52:00 -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 + -- 2.26.2