From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MDERBqH/c2EvYwAAgWs5BA (envelope-from ) for ; Sat, 23 Oct 2021 14:27:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id cJe1AaH/c2ESfgAA1q6Kng (envelope-from ) for ; Sat, 23 Oct 2021 12:27:13 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8417A72F6 for ; Sat, 23 Oct 2021 14:27:12 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 222FC2C1AA; Sat, 23 Oct 2021 08:27:08 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 354552C1A6 for ; Sat, 23 Oct 2021 08:27:06 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 0A3D75FC42; Sat, 23 Oct 2021 08:27:06 -0400 (EDT) Received: (nullmailer pid 1742131 invoked by uid 1000); Sat, 23 Oct 2021 12:27:04 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 1/2] lib/compact: replace deprecated notmuch_database_open_verbose Date: Sat, 23 Oct 2021 09:27:01 -0300 Message-Id: <20211023122702.1742118-1-david@tethera.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Message-ID-Hash: A7WXHXJSAXG6K2SRCPCZM3SUZ2AQ5CW4 X-Message-ID-Hash: A7WXHXJSAXG6K2SRCPCZM3SUZ2AQ5CW4 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-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1634992032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=DSsARHvVe4tAw9Lp66TGntfac8Lql7yVg3+S81/SqXg=; b=HnCMbj86+X7lad755ycLjCg7ABIWbv15aUjZfik5Z/rnuPSRf/WI0vFJONK/flVvkS7RLP hVE7aXFWkh+EpvsTNsziNXaIzf3ZOAbt/kGhVMeYMThw1sf4N/AY4qNkisLHWQdGf1+Al7 tWh/yD7hlwCsqrhs7GiiIA6S/J5qE84ZTzMFQp6mjCrpJIDr4Loy+WgYraXBqjTl6JYYNx Jx3LsOvjySfXr55TJjv0+g+pWnLXGTzNjZfkx/90anhvuq9e6iUNj/BSH+OtdDj8qZqtFd fAet76b8ASR4qYZq1loOXMVy0EnfS7gZjIeWF7t89tkk0d2N1f0F8qM3dDeLFQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1634992032; a=rsa-sha256; cv=none; b=QFryqcuap2pukjymbCLDce2tzo/Z8cQr4vVMLssICCmcCewemBo9dV+ln/yw8c9Gx/I0sN UQgY0vM3mhFgHK5I14SiiPqdcreI+seLLVgMfVS3uuZ1ZN3pcJxu81BXFp6vixXY7m+0hA 0WMSqPur0SBvkFfmpXzW0sLhqZYdORwcJR3DG+PnA1dWkq4HCnlsAdhNAdvEzCQxxVdcwa y0TKUwKrOzhHU2cyNhE8yRY7Lvuw7eRoNvxEaKl+VIxEAIazUPRYF6GEDnMJaUjZGNrb0U XlAHRHkmsxE+AAMIE4d4uF2vwT6xCRmXJmvCuVxb2CPLzh9bk7hTLfA1/kuLTQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.15 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 8417A72F6 X-Spam-Score: -1.15 X-Migadu-Scanner: scn1.migadu.com X-TUID: tIEst0VZp4Sc It should not be necesary to have any config information here, hence passing "" to n_d_open_with_config. --- lib/database.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index 7eb0de79..6ef56d56 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -590,10 +590,12 @@ notmuch_database_compact (const char *path, notmuch_database_t *notmuch = NULL; char *message = NULL; - ret = notmuch_database_open_verbose (path, - NOTMUCH_DATABASE_MODE_READ_WRITE, - ¬much, - &message); + ret = notmuch_database_open_with_config (path, + NOTMUCH_DATABASE_MODE_READ_WRITE, + "", + NULL, + ¬much, + &message); if (ret) { if (status_cb) status_cb (message, closure); return ret; -- 2.33.0