From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 5DFA06DE2DFF for ; Sat, 15 Jul 2017 11:57:56 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.001 X-Spam-Level: X-Spam-Status: No, score=-0.001 tagged_above=-999 required=5 tests=[AWL=0.010, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] 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 So29vEWvUHbX for ; Sat, 15 Jul 2017 11:57:55 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id A0D056DE26BE for ; Sat, 15 Jul 2017 11:57:54 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1dWSD4-0005x6-4F; Sat, 15 Jul 2017 14:54:34 -0400 Received: (nullmailer pid 17686 invoked by uid 1000); Sat, 15 Jul 2017 18:57:49 -0000 From: David Bremner To: Daniel Kahn Gillmor , Notmuch Mail Subject: [PATCH 2/4] cli/crypto: eliminated compiler warnings about unused arguments Date: Sat, 15 Jul 2017 15:57:42 -0300 Message-Id: <20170715185744.17640-2-david@tethera.net> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170715185744.17640-1-david@tethera.net> References: <20170714131202.24966-3-dkg@fifthhorseman.net> <20170715185744.17640-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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: Sat, 15 Jul 2017 18:57:56 -0000 These are due to (excessively?) fancy macro definitions in gmime-extra.h --- mime-node.c | 4 ++-- util/gmime-extra.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mime-node.c b/mime-node.c index 7363e222..bc41b752 100644 --- a/mime-node.c +++ b/mime-node.c @@ -151,7 +151,7 @@ set_signature_list_destructor (mime_node_t *node) /* Verify a signed mime node (GMime 2.6) */ static void node_verify (mime_node_t *node, GMimeObject *part, - notmuch_crypto_context_t *cryptoctx) + g_mime_3_unused(notmuch_crypto_context_t *cryptoctx)) { GError *err = NULL; @@ -172,7 +172,7 @@ node_verify (mime_node_t *node, GMimeObject *part, /* Decrypt and optionally verify an encrypted mime node (GMime 2.6) */ static void node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, - notmuch_crypto_context_t *cryptoctx) + g_mime_3_unused(notmuch_crypto_context_t *cryptoctx)) { GError *err = NULL; GMimeDecryptResult *decrypt_result = NULL; diff --git a/util/gmime-extra.h b/util/gmime-extra.h index 8096dbe3..de275bc1 100644 --- a/util/gmime-extra.h +++ b/util/gmime-extra.h @@ -14,6 +14,7 @@ GMimeStream *g_mime_stream_stdout_new(void); #define GMIME_ADDRESS_TYPE_BCC GMIME_RECIPIENT_TYPE_BCC #define g_mime_2_6_unref(obj) g_object_unref (obj) +#define g_mime_3_unused(arg) arg #define g_mime_certificate_get_fpr16(cert) g_mime_certificate_get_key_id (cert) #define g_mime_certificate_get_uid(cert) g_mime_certificate_get_name (cert); #else /* GMime >= 3.0 */ @@ -56,6 +57,7 @@ typedef GMimeTrust GMimeCertificateTrust; #define GMIME_CERTIFICATE_TRUST_ULTIMATE GMIME_TRUST_ULTIMATE #define g_mime_2_6_unref(obj) /*ignore*/ +#define g_mime_3_unused(arg) unused(arg) #endif /** -- 2.13.2