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 DB7216DE1B1C for ; Mon, 14 Dec 2015 05:39:18 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.316 X-Spam-Level: X-Spam-Status: No, score=-0.316 tagged_above=-999 required=5 tests=[AWL=0.235, 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 K8CcWre0O-GB for ; Mon, 14 Dec 2015 05:39:13 -0800 (PST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 4EE9D6DE0FF8 for ; Mon, 14 Dec 2015 05:39:11 -0800 (PST) Received: from remotemail by fethera.tethera.net with local (Exim 4.84) (envelope-from ) id 1a8TLG-0008Eq-G7; Mon, 14 Dec 2015 08:39:06 -0500 Received: (nullmailer pid 31794 invoked by uid 1000); Mon, 14 Dec 2015 13:39:04 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [Patch v3 1/8] crypto: refactor context creation to facilitate further work Date: Mon, 14 Dec 2015 09:38:50 -0400 Message-Id: <1450100337-31655-2-git-send-email-david@tethera.net> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1450100337-31655-1-git-send-email-david@tethera.net> References: <1450100337-31655-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: Mon, 14 Dec 2015 13:39:19 -0000 From: Jani Nikula Let the context creation functions decide how to handle multiple calls and cache the crypto context. No functional changes. --- crypto.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/crypto.c b/crypto.c index a6eb27d..1187ad7 100644 --- a/crypto.c +++ b/crypto.c @@ -22,14 +22,20 @@ /* Create a GPG context (GMime 2.6) */ static notmuch_crypto_context_t * -create_gpg_context (const char *gpgpath) +create_gpg_context (notmuch_crypto_t *crypto) { notmuch_crypto_context_t *gpgctx; + if (crypto->gpgctx) + return crypto->gpgctx; + /* TODO: GMimePasswordRequestFunc */ - gpgctx = g_mime_gpg_context_new (NULL, gpgpath ? gpgpath : "gpg"); - if (! gpgctx) + gpgctx = g_mime_gpg_context_new (NULL, crypto->gpgpath ? crypto->gpgpath : "gpg"); + if (! gpgctx) { + fprintf (stderr, "Failed to construct gpg context.\n"); return NULL; + } + crypto->gpgctx = gpgctx; g_mime_gpg_context_set_use_agent ((GMimeGpgContext *) gpgctx, TRUE); g_mime_gpg_context_set_always_trust ((GMimeGpgContext *) gpgctx, FALSE); @@ -57,12 +63,7 @@ notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol) */ if (strcasecmp (protocol, "application/pgp-signature") == 0 || strcasecmp (protocol, "application/pgp-encrypted") == 0) { - if (! crypto->gpgctx) { - crypto->gpgctx = create_gpg_context (crypto->gpgpath); - if (! crypto->gpgctx) - fprintf (stderr, "Failed to construct gpg context.\n"); - } - cryptoctx = crypto->gpgctx; + cryptoctx = create_gpg_context (crypto); } else { fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n"); } -- 2.6.2