From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UGGAHmFIFF/3IwAA0tVLHw (envelope-from ) for ; Sun, 19 Jul 2020 13:19:29 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4EgwGmFIFF94BAAAbx9fmQ (envelope-from ) for ; Sun, 19 Jul 2020 13:19:29 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E22669401AE for ; Sun, 19 Jul 2020 13:19:28 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 034A220611; Sun, 19 Jul 2020 09:19:12 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 222771FA58 for ; Sun, 19 Jul 2020 09:19:05 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 1B70F609DB; Sun, 19 Jul 2020 09:19:05 -0400 (EDT) Received: (nullmailer pid 158748 invoked by uid 1000); Sun, 19 Jul 2020 13:19:01 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 2/8] lib: rename _n_d_create to _n_d_find_or_create Date: Sun, 19 Jul 2020 10:18:51 -0300 Message-Id: <20200719131857.158655-3-david@tethera.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200719131857.158655-1-david@tethera.net> References: <20200719131857.158655-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: DCV5BG5YOHRRYGLIRKLRLXW6FTTOR3NS X-Message-ID-Hash: DCV5BG5YOHRRYGLIRKLRLXW6FTTOR3NS X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 1.53 X-TUID: JsjEPtdNeq7h The error message and name were confusing when called in some "read only" context. --- lib/database.cc | 10 +++++----- lib/directory.cc | 10 +++++----- lib/notmuch-private.h | 8 ++++---- test/T560-lib-error.sh | 2 +- test/T562-lib-database.sh | 3 +-- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index 25d34253..f81f28f8 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -1605,8 +1605,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch, mtime = Xapian::sortable_unserialise ( document.get_value (NOTMUCH_VALUE_TIMESTAMP)); - directory = _notmuch_directory_create (notmuch, term.c_str () + 10, - NOTMUCH_FIND_CREATE, &status); + directory = _notmuch_directory_find_or_create (notmuch, term.c_str () + 10, + NOTMUCH_FIND_CREATE, &status); notmuch_directory_set_mtime (directory, mtime); notmuch_directory_destroy (directory); @@ -1878,7 +1878,7 @@ _notmuch_database_find_directory_id (notmuch_database_t *notmuch, return NOTMUCH_STATUS_SUCCESS; } - directory = _notmuch_directory_create (notmuch, path, flags, &status); + directory = _notmuch_directory_find_or_create (notmuch, path, flags, &status); if (status || ! directory) { *directory_id = -1; return status; @@ -1988,8 +1988,8 @@ notmuch_database_get_directory (notmuch_database_t *notmuch, *directory = NULL; try { - *directory = _notmuch_directory_create (notmuch, path, - NOTMUCH_FIND_LOOKUP, &status); + *directory = _notmuch_directory_find_or_create (notmuch, path, + NOTMUCH_FIND_LOOKUP, &status); } catch (const Xapian::Error &error) { _notmuch_database_log (notmuch, "A Xapian exception occurred getting directory: %s.\n", error.get_msg ().c_str ()); diff --git a/lib/directory.cc b/lib/directory.cc index af71f402..09b49245 100644 --- a/lib/directory.cc +++ b/lib/directory.cc @@ -94,10 +94,10 @@ find_directory_document (notmuch_database_t *notmuch, * NOTMUCH_STATUS_SUCCESS and this returns NULL. */ notmuch_directory_t * -_notmuch_directory_create (notmuch_database_t *notmuch, - const char *path, - notmuch_find_flags_t flags, - notmuch_status_t *status_ret) +_notmuch_directory_find_or_create (notmuch_database_t *notmuch, + const char *path, + notmuch_find_flags_t flags, + notmuch_status_t *status_ret) { Xapian::WritableDatabase *db; notmuch_directory_t *directory; @@ -187,7 +187,7 @@ _notmuch_directory_create (notmuch_database_t *notmuch, directory->doc.get_value (NOTMUCH_VALUE_TIMESTAMP)); } catch (const Xapian::Error &error) { _notmuch_database_log (notmuch, - "A Xapian exception occurred creating a directory: %s.\n", + "A Xapian exception occurred finding/creating a directory: %s.\n", error.get_msg ().c_str ()); notmuch->exception_reported = true; notmuch_directory_destroy (directory); diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 28ced3a2..2bbbb293 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -251,10 +251,10 @@ _notmuch_database_filename_to_direntry (void *ctx, /* directory.cc */ notmuch_directory_t * -_notmuch_directory_create (notmuch_database_t *notmuch, - const char *path, - notmuch_find_flags_t flags, - notmuch_status_t *status_ret); +_notmuch_directory_find_or_create (notmuch_database_t *notmuch, + const char *path, + notmuch_find_flags_t flags, + notmuch_status_t *status_ret); unsigned int _notmuch_directory_get_document_id (notmuch_directory_t *directory); diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh index fda1f170..908bb9d8 100755 --- a/test/T560-lib-error.sh +++ b/test/T560-lib-error.sh @@ -275,7 +275,7 @@ sed 's/^\(A Xapian exception [^:]*\):.*$/\1/' < OUTPUT > OUTPUT.clean cat <<'EOF' >EXPECTED == stdout == == stderr == -A Xapian exception occurred creating a directory +A Xapian exception occurred finding/creating a directory EOF test_expect_equal_file EXPECTED OUTPUT.clean restore_database diff --git a/test/T562-lib-database.sh b/test/T562-lib-database.sh index 56cc849c..5ebaf64c 100755 --- a/test/T562-lib-database.sh +++ b/test/T562-lib-database.sh @@ -228,7 +228,7 @@ cat < EXPECTED == stdout == 1 == stderr == -A Xapian exception occurred creating a directory: Database has been closed. +A Xapian exception occurred finding/creating a directory: Database has been closed. EOF test_expect_equal_file EXPECTED OUTPUT @@ -283,7 +283,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "remove message file with a closed db" -test_subtest_known_broken cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} { EXPECT0(notmuch_database_close (db)); -- 2.27.0