From: Jani Nikula Date: Thu, 17 May 2012 07:40:09 +0000 (+0300) Subject: Re: [PATCH 3/6] cli: modify mime_node_open to take crypto struct as argument X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9431859d2bfde3829f7516d026b401a54de1e538;p=notmuch-archives.git Re: [PATCH 3/6] cli: modify mime_node_open to take crypto struct as argument --- diff --git a/98/ad67cc0eefa24984601a4b0cff64e1fcda9ff8 b/98/ad67cc0eefa24984601a4b0cff64e1fcda9ff8 new file mode 100644 index 000000000..b2f6f933c --- /dev/null +++ b/98/ad67cc0eefa24984601a4b0cff64e1fcda9ff8 @@ -0,0 +1,189 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id CE0A1431FAF + for ; Thu, 17 May 2012 00:40:15 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id tju43eBMD4OD for ; + Thu, 17 May 2012 00:40:15 -0700 (PDT) +Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com + [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id BD930431FAE + for ; Thu, 17 May 2012 00:40:14 -0700 (PDT) +Received: by lagu2 with SMTP id u2so1267840lag.26 + for ; Thu, 17 May 2012 00:40:13 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:subject:in-reply-to:references:user-agent:date:message-id + :mime-version:content-type:x-gm-message-state; + bh=CDm68BDzzhfko6/HI/HInJ2q3+90we5sC+F4IyccBAI=; + b=Jf9kMhTFMThaY9+OSTjgBsGqe64jV+i5rXNfke/N9Tawex7FmRqoyoi7c6QlPRTGwR + tLJJJF5OSnFw/g8ydms80k1MlVWxNRUdRwFJgKd336aMfJDxoSi8CrW0m010LOsC1Xpl + HiWz777U0fmYrC3fC97vms0eNfxSdF1TTrZj163jXUOjS+keKQN4JxgGhNxav++/jYPK + xW8KkB3gPDOElZrvguxGjVUgd9gQZ6JvDmjh8n7XZQCNGc4aDeJdULjkaoKhU2IuBLCE + pLBqfXZ5+B5C4tVoYvRzZXPTFVFPcH/QuRM2g68j25VjBliL2LOtGkVE8D/MVA4wQ0u0 + SJpA== +Received: by 10.152.132.166 with SMTP id ov6mr6383606lab.35.1337240413100; + Thu, 17 May 2012 00:40:13 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi. + [80.220.80.68]) + by mx.google.com with ESMTPS id oi3sm6696204lab.12.2012.05.17.00.40.11 + (version=SSLv3 cipher=OTHER); Thu, 17 May 2012 00:40:12 -0700 (PDT) +From: Jani Nikula +To: Jameson Graef Rollins , + Notmuch Mail +Subject: Re: [PATCH 3/6] cli: modify mime_node_open to take crypto struct as + argument +In-Reply-To: <1337205359-2444-4-git-send-email-jrollins@finestructure.net> +References: <1337205359-2444-1-git-send-email-jrollins@finestructure.net> + <1337205359-2444-2-git-send-email-jrollins@finestructure.net> + <1337205359-2444-3-git-send-email-jrollins@finestructure.net> + <1337205359-2444-4-git-send-email-jrollins@finestructure.net> +User-Agent: Notmuch/0.13+13~gc259b9a (http://notmuchmail.org) Emacs/23.3.1 + (i686-pc-linux-gnu) +Date: Thu, 17 May 2012 10:40:09 +0300 +Message-ID: <878vgri7c6.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Gm-Message-State: + ALoCoQnkaoP7y4X1hI4DftRPfu1xuC1OYioyqLZWdk/FlWcSg2r1UtqG63UDsYZtyfSmOY+hmxFr +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Thu, 17 May 2012 07:40:15 -0000 + +On Thu, 17 May 2012, Jameson Graef Rollins wrote: +> Again, for interface simplification and getting rid of more #ifdefs. +> --- +> mime-node.c | 10 ++-------- +> notmuch-client.h | 14 +++++--------- +> notmuch-reply.c | 6 ++---- +> notmuch-show.c | 3 +-- +> 4 files changed, 10 insertions(+), 23 deletions(-) +> +> diff --git a/mime-node.c b/mime-node.c +> index 79a3654..4faeffc 100644 +> --- a/mime-node.c +> +++ b/mime-node.c +> @@ -56,12 +56,7 @@ _mime_node_context_free (mime_node_context_t *res) +> +> notmuch_status_t +> mime_node_open (const void *ctx, notmuch_message_t *message, +> -#ifdef GMIME_ATLEAST_26 +> - GMimeCryptoContext *cryptoctx, +> -#else +> - GMimeCipherContext *cryptoctx, +> -#endif +> - notmuch_bool_t decrypt, mime_node_t **root_out) +> + notmuch_crypto_t *crypto, mime_node_t **root_out) +> { +> const char *filename = notmuch_message_get_filename (message); +> mime_node_context_t *mctx; +> @@ -113,8 +108,7 @@ mime_node_open (const void *ctx, notmuch_message_t *message, +> goto DONE; +> } +> +> - mctx->crypto.gpgctx = cryptoctx; +> - mctx->crypto.decrypt = decrypt; +> + mctx->crypto = *crypto; +> +> /* Create the root node */ +> root->part = GMIME_OBJECT (mctx->mime_message); +> diff --git a/notmuch-client.h b/notmuch-client.h +> index 2ad24cf..d86fab3 100644 +> --- a/notmuch-client.h +> +++ b/notmuch-client.h +> @@ -345,9 +345,10 @@ struct mime_node { +> }; +> +> /* Construct a new MIME node pointing to the root message part of +> - * message. If cryptoctx is non-NULL, it will be used to verify +> - * signatures on any child parts. If decrypt is true, then cryptoctx +> - * will additionally be used to decrypt any encrypted child parts. +> + * message. If crypto.gpgctx is non-NULL, it will be used to verify +> + * signatures on any child parts. If crypto.decrypt is true, then +> + * crypto.gpgctx will additionally be used to decrypt any encrypted +> + * child parts. +> * +> * Return value: +> * +> @@ -359,12 +360,7 @@ struct mime_node { +> */ +> notmuch_status_t +> mime_node_open (const void *ctx, notmuch_message_t *message, +> -#ifdef GMIME_ATLEAST_26 +> - GMimeCryptoContext *cryptoctx, +> -#else +> - GMimeCipherContext *cryptoctx, +> -#endif +> - notmuch_bool_t decrypt, mime_node_t **node_out); +> + notmuch_crypto_t *crypto, mime_node_t **node_out); +> +> /* Return a new MIME node for the requested child part of parent. +> * parent will be used as the talloc context for the returned child +> diff --git a/notmuch-reply.c b/notmuch-reply.c +> index ed87899..6662adb 100644 +> --- a/notmuch-reply.c +> +++ b/notmuch-reply.c +> @@ -544,8 +544,7 @@ notmuch_reply_format_default(void *ctx, +> g_object_unref (G_OBJECT (reply)); +> reply = NULL; +> +> - if (mime_node_open (ctx, message, crypto->gpgctx, crypto->decrypt, +> - &root) == NOTMUCH_STATUS_SUCCESS) { +> + if (mime_node_open (ctx, message, crypto, &root) == NOTMUCH_STATUS_SUCCESS) { +> format_part_reply (root); +> talloc_free (root); +> } +> @@ -574,8 +573,7 @@ notmuch_reply_format_json(void *ctx, +> +> messages = notmuch_query_search_messages (query); +> message = notmuch_messages_get (messages); +> - if (mime_node_open (ctx, message, crypto->gpgctx, crypto->decrypt, +> - &node) != NOTMUCH_STATUS_SUCCESS) +> + if (mime_node_open (ctx, message, crypto, &node) != NOTMUCH_STATUS_SUCCESS) +> return 1; +> +> reply = create_reply_message (ctx, config, message, reply_all); +> diff --git a/notmuch-show.c b/notmuch-show.c +> index d254179..8b4d308 100644 +> --- a/notmuch-show.c +> +++ b/notmuch-show.c +> @@ -810,8 +810,7 @@ show_message (void *ctx, +> mime_node_t *root, *part; +> notmuch_status_t status; +> +> - status = mime_node_open (local, message, params->crypto.gpgctx, +> - params->crypto.decrypt, &root); +> + status = mime_node_open (local, message, &(params->crypto), &root); + +The parenthesis around params->crypto are not needed, otherwise LGTM. + +> if (status) +> goto DONE; +> part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part)); +> -- +> 1.7.10 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch