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 KPA+K9CIIGD3DQAA0tVLHw (envelope-from ) for ; Mon, 08 Feb 2021 00:41:52 +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 gFH4JtCIIGDFawAAbx9fmQ (envelope-from ) for ; Mon, 08 Feb 2021 00:41:52 +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 685AF94029C for ; Mon, 8 Feb 2021 00:41:52 +0000 (UTC) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 701001FD22; Sun, 7 Feb 2021 19:41:27 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id BDC701FBA4 for ; Sun, 7 Feb 2021 19:41:20 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id B615E606DB; Sun, 7 Feb 2021 19:41:20 -0500 (EST) Received: (nullmailer pid 1193269 invoked by uid 1000); Mon, 08 Feb 2021 00:41:15 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 09/23] lib/open: factor out library intialization Date: Sun, 7 Feb 2021 20:40:55 -0400 Message-Id: <20210208004109.1192719-10-david@tethera.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208004109.1192719-1-david@tethera.net> References: <20210208004109.1192719-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: ZTU3TVGDIAXJXLHTNMNY5K57YHYPNZAU X-Message-ID-Hash: ZTU3TVGDIAXJXLHTNMNY5K57YHYPNZAU 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 X-Migadu-Spam-Score: -0.95 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-Migadu-Queue-Id: 685AF94029C X-Spam-Score: -0.95 X-Migadu-Scanner: scn1.migadu.com X-TUID: BxQpt5Ai/gw3 This is slightly more tidy, but more importantly it allows for re-use of this code in n_d_create_with_config --- lib/open.cc | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/lib/open.cc b/lib/open.cc index 09fec6e4..ff298030 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -200,6 +200,22 @@ notmuch_database_t * _alloc_notmuch() { return notmuch; } +static void _init_libs () { + + static int initialized = 0; + + /* Initialize the GLib type system and threads */ +#if ! GLIB_CHECK_VERSION (2, 35, 1) + g_type_init (); +#endif + + /* Initialize gmime */ + if (! initialized) { + g_mime_init (); + initialized = 1; + } +} + notmuch_status_t notmuch_database_open_with_config (const char *database_path, notmuch_database_mode_t mode, @@ -219,6 +235,8 @@ notmuch_database_open_with_config (const char *database_path, GKeyFile *key_file = NULL; static int initialized = 0; + _init_libs (); + notmuch = _alloc_notmuch (); if (!notmuch) { status = NOTMUCH_STATUS_OUT_OF_MEMORY; @@ -251,17 +269,6 @@ notmuch_database_open_with_config (const char *database_path, goto DONE; } - /* Initialize the GLib type system and threads */ -#if ! GLIB_CHECK_VERSION (2, 35, 1) - g_type_init (); -#endif - - /* Initialize gmime */ - if (! initialized) { - g_mime_init (); - initialized = 1; - } - try { std::string last_thread_id; std::string last_mod; -- 2.30.0