[PATCH] cli: mime node: fix compiler warning when building against gmime 2.4
On Sat, 06 Apr 2013, Jani Nikula wrote:
> commit d487ef9e58bcd193118f19f771d5ef3984616be5
> Author: Jani Nikula
> Date: Sat Mar 30 15:53:16 2013 +0200
>
> cli: mime node: abstract decryption and signature verification
>
> introduced a compiler warning, reported by Mark Walters, when building
> against gmime 2.4:
>
> mime-node.c:224:9: warning: assignment discards ?const? qualifier from
> pointer target type [enabled by default]
>
> Pass the non-const signature validity to the destructor to fix this.
>
> ---
>
> Not even compile tested as I don't have gmime 2.4 on any
> systems... Mark, please build and run the tests with this. Thanks.
This fixes the build warning and all tests pass. Thanks!
Mark
> ---
> mime-node.c | 13 -
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/mime-node.c b/mime-node.c
> index 851f963..fd9e4a4 100644
> --- a/mime-node.c
> +++ b/mime-node.c
> @@ -217,11 +217,12 @@ _signature_validity_free (GMimeSignatureValidity
> **proxy)
>
> /* Set up signature validity destructor (GMime 2.4) */
> static void
> -set_signature_validity_destructor (mime_node_t *node)
> +set_signature_validity_destructor (mime_node_t *node,
> +GMimeSignatureValidity *sig_validity)
> {
> GMimeSignatureValidity **proxy = talloc (node, GMimeSignatureValidity *);
> if (proxy) {
> - *proxy = node->sig_validity;
> + *proxy = sig_validity;
> talloc_set_destructor (proxy, _signature_validity_free);
> }
> }
> @@ -232,12 +233,14 @@ node_verify (mime_node_t *node, GMimeObject *part,
>notmuch_crypto_context_t *cryptoctx)
> {
> GError *err = NULL;
> +GMimeSignatureValidity *sig_validity;
>
> node->verify_attempted = TRUE;
> -node->sig_validity = g_mime_multipart_signed_verify
> +sig_validity = g_mime_multipart_signed_verify
> (GMIME_MULTIPART_SIGNED (part), cryptoctx, );
> -if (node->sig_validity) {
> - set_signature_validity_destructor (node);
> +node->sig_validity = sig_validity;
> +if (sig_validity) {
> + set_signature_validity_destructor (node, sig_validity);
> } else {
> fprintf (stderr, "Failed to verify signed part: %s\n",
>err ? err->message : "no error explanation given");
> --
> 1.7.10.4
Re: [PATCH] cli: mime node: fix compiler warning when building against gmime 2.4
On Sat, 06 Apr 2013, Jani Nikula j...@nikula.org wrote:
commit d487ef9e58bcd193118f19f771d5ef3984616be5
Author: Jani Nikula j...@nikula.org
Date: Sat Mar 30 15:53:16 2013 +0200
cli: mime node: abstract decryption and signature verification
introduced a compiler warning, reported by Mark Walters, when building
against gmime 2.4:
mime-node.c:224:9: warning: assignment discards ‘const’ qualifier from
pointer target type [enabled by default]
Pass the non-const signature validity to the destructor to fix this.
---
Not even compile tested as I don't have gmime 2.4 on any
systems... Mark, please build and run the tests with this. Thanks.
This fixes the build warning and all tests pass. Thanks!
Mark
---
mime-node.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/mime-node.c b/mime-node.c
index 851f963..fd9e4a4 100644
--- a/mime-node.c
+++ b/mime-node.c
@@ -217,11 +217,12 @@ _signature_validity_free (GMimeSignatureValidity
**proxy)
/* Set up signature validity destructor (GMime 2.4) */
static void
-set_signature_validity_destructor (mime_node_t *node)
+set_signature_validity_destructor (mime_node_t *node,
+GMimeSignatureValidity *sig_validity)
{
GMimeSignatureValidity **proxy = talloc (node, GMimeSignatureValidity *);
if (proxy) {
- *proxy = node-sig_validity;
+ *proxy = sig_validity;
talloc_set_destructor (proxy, _signature_validity_free);
}
}
@@ -232,12 +233,14 @@ node_verify (mime_node_t *node, GMimeObject *part,
notmuch_crypto_context_t *cryptoctx)
{
GError *err = NULL;
+GMimeSignatureValidity *sig_validity;
node-verify_attempted = TRUE;
-node-sig_validity = g_mime_multipart_signed_verify
+sig_validity = g_mime_multipart_signed_verify
(GMIME_MULTIPART_SIGNED (part), cryptoctx, err);
-if (node-sig_validity) {
- set_signature_validity_destructor (node);
+node-sig_validity = sig_validity;
+if (sig_validity) {
+ set_signature_validity_destructor (node, sig_validity);
} else {
fprintf (stderr, Failed to verify signed part: %s\n,
err ? err-message : no error explanation given);
--
1.7.10.4
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
Re: [PATCH] debian: package ruby bindings
On Wed, Apr 3, 2013 at 5:27 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- debian/control | 14 ++ debian/notmuch-ruby.install | 1 + debian/rules| 9 + 3 files changed, 24 insertions(+) create mode 100644 debian/notmuch-ruby.install No comments? Should I push this? -- Felipe Contreras ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
