[PATCH 2/8] crypto: make crypto ctx initialization an array

diff --git a/37/a39ec0f4ccaa5ddd7203e93ac4a65297d11227 b/37/a39ec0f4ccaa5ddd7203e93ac4a65297d11227
new file mode 100644 (file)
index 0000000..6a4393d
--- /dev/null
+++ b/37/a39ec0f4ccaa5ddd7203e93ac4a65297d11227
@@ -0,0 +1,91 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 912DC6DE14D1\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Aug 2015 10:44:06 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.125\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.125 tagged_above=-999 required=5 tests=[AWL=0.115, \r
+ T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id nII8wBD91_0S for <notmuch@notmuchmail.org>;\r
+ Sun, 16 Aug 2015 10:44:05 -0700 (PDT)\r
+Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id C74E86DE0B26\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Aug 2015 10:44:04 -0700 (PDT)\r
+Received: from remotemail by gitolite.debian.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1ZR1x3-0003cg-23; Sun, 16 Aug 2015 17:42:33 +0000\r
+Received: (nullmailer pid 26309 invoked by uid 1000); Sun, 16 Aug 2015\r
+ 17:41:28 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/8] crypto: make crypto ctx initialization an array\r
+Date: Sun, 16 Aug 2015 19:41:10 +0200\r
+Message-Id: <1439746876-23654-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.5.0\r
+In-Reply-To: <1439746876-23654-1-git-send-email-david@tethera.net>\r
+References: <54CA467B.30408@gnome.org>\r
+ <1439746876-23654-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 16 Aug 2015 17:44:06 -0000\r
+\r
+From: Jani Nikula <jani@nikula.org>\r
+\r
+Make it trivial to add handlers for new protocols without duplicating\r
+code. No functional changes.\r
+---\r
+ crypto.c | 13 +++++++------\r
+ 1 file changed, 7 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/crypto.c b/crypto.c\r
+index 1187ad7..f415abd 100644\r
+--- a/crypto.c\r
++++ b/crypto.c\r
+@@ -49,6 +49,7 @@ notmuch_crypto_context_t *\r
+ notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)\r
+ {\r
+     notmuch_crypto_context_t *cryptoctx = NULL;\r
++    size_t i;\r
+ \r
+     if (! protocol) {\r
+       fprintf (stderr, "Cryptographic protocol is empty.\n");\r
+@@ -61,14 +62,14 @@ notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)\r
+      * parameter names as defined in this document are\r
+      * case-insensitive."  Thus, we use strcasecmp for the protocol.\r
+      */\r
+-    if (strcasecmp (protocol, "application/pgp-signature") == 0 ||\r
+-      strcasecmp (protocol, "application/pgp-encrypted") == 0) {\r
+-      cryptoctx = create_gpg_context (crypto);\r
+-    } else {\r
+-      fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n");\r
++    for (i = 0; i < ARRAY_SIZE (protocols); i++) {\r
++      if (strcasecmp (protocol, protocols[i].protocol) == 0)\r
++          return protocols[i].get_context (crypto);\r
+     }\r
+ \r
+-    return cryptoctx;\r
++    fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n");\r
++\r
++    return NULL;\r
+ }\r
+ \r
+ int\r
+-- \r
+2.5.0\r
+\r