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 41B926DE112B for ; Thu, 29 Aug 2019 08:39:11 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -1.397 X-Spam-Level: X-Spam-Status: No, score=-1.397 tagged_above=-999 required=5 tests=[AWL=1.104, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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 0N00RKKIXvHY for ; Thu, 29 Aug 2019 08:39:10 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id 83A196DE10F9 for ; Thu, 29 Aug 2019 08:39:05 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1567093142; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=nBVTa0vqg3Iwd1I6XZYyWCv25N3ZJ3jg1vg0AFVwGJU=; b=Oc4L6Fh2tgYBj5iiSGmh7rDMxGGS8TU0IH2dlScesmlPeBVN/U3TSygH q3K0BlpvjNMHgNqRlK+laAlViywkCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1567093142; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=nBVTa0vqg3Iwd1I6XZYyWCv25N3ZJ3jg1vg0AFVwGJU=; b=K4TaysuaPt72ovHc1Imsr8otVbzyezCsFbNesNJb3ZMvCL+nMpe9irVz RAl7YkKLAf9LRQWD4Aai0Ut8BlEHViT7qda7KKoTavH4LB6YUdqcJD6kgo dvX8lrXwcbMpqJD8K4OvdJf2NPZn+mieH0BBzH7yGGITQ9Wm2BbFIWxT6Z zQE8HR+2pgTgB46cMIxQXv5T/CIwUdhGg+IrwXgLXoG2r+ujdXYuepdmiQ cpELMLgPO1SzI2s72zihWYvNLfjTLzyHetNtSYWRHhYQfE4PbDH5dHmiEs Kk4D++wTvg3KhTbNE7lJVZ8YDgLhzSaDVb6VjViKomKiFeri+Yw5gA== Received: from fifthhorseman.net (unknown [38.109.115.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 165E0F9A5 for ; Thu, 29 Aug 2019 11:39:01 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 5F5212007A; Thu, 29 Aug 2019 11:38:57 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH v4 1/8] mime-node: split out _mime_node_set_up_part Date: Thu, 29 Aug 2019 11:38:46 -0400 Message-Id: <20190829153853.12199-2-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20190829153853.12199-1-dkg@fifthhorseman.net> References: <20190829153853.12199-1-dkg@fifthhorseman.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 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, 29 Aug 2019 15:39:11 -0000 This is a code reorganization that should have no functional effect, but will make future changes simpler, because a future commit will reuse the _mime_node_set_up_part functionality without touching _mime_node_create. In the course of splitting out this function, I noticed a comment in the codebase that referred to an older name of _mime_node_create (message_part_create), where this functionality originally resided. I've fixed that comment to refer to the new function instead. Signed-off-by: Daniel Kahn Gillmor --- mime-node.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/mime-node.c b/mime-node.c index 3133ca44..d2125f90 100644 --- a/mime-node.c +++ b/mime-node.c @@ -264,14 +264,15 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part) g_error_free (err); } +static bool +_mime_node_set_up_part (mime_node_t *node, GMimeObject *part, int numchild); + static mime_node_t * _mime_node_create (mime_node_t *parent, GMimeObject *part, int numchild) { mime_node_t *node = talloc_zero (parent, mime_node_t); - notmuch_status_t status; /* Set basic node properties */ - node->part = part; node->ctx = parent->ctx; if (! talloc_reference (node, node->ctx)) { fprintf (stderr, "Out of memory.\n"); @@ -282,10 +283,24 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part, int numchild) node->part_num = node->next_part_num = -1; node->next_child = 0; + if (_mime_node_set_up_part (node, part, numchild)) + return node; + talloc_free (node); + return NULL; +} + +/* associate a MIME part with a node. */ +static bool +_mime_node_set_up_part (mime_node_t *node, GMimeObject *part, int numchild) +{ + notmuch_status_t status; + /* Deal with the different types of parts */ if (GMIME_IS_PART (part)) { + node->part = part; node->nchildren = 0; } else if (GMIME_IS_MULTIPART (part)) { + node->part = part; node->nchildren = g_mime_multipart_get_count (GMIME_MULTIPART (part)); } else if (GMIME_IS_MESSAGE_PART (part)) { /* Promote part to an envelope and open it */ @@ -297,11 +312,10 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part, int numchild) } else { fprintf (stderr, "Warning: Unknown mime part type: %s.\n", g_type_name (G_OBJECT_TYPE (part))); - talloc_free (node); - return NULL; + return false; } - /* Handle PGP/MIME parts */ + /* Handle PGP/MIME parts (by definition not cryptographic payload parts) */ if (GMIME_IS_MULTIPART_ENCRYPTED (part) && (node->ctx->crypto->decrypt != NOTMUCH_DECRYPT_FALSE)) { if (node->nchildren != 2) { /* this violates RFC 3156 section 4, so we won't bother with it. */ @@ -321,12 +335,12 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part, int numchild) node_verify (node, part); } } else { - status = _notmuch_message_crypto_potential_payload (node->ctx->msg_crypto, part, parent ? parent->part : NULL, numchild); + status = _notmuch_message_crypto_potential_payload (node->ctx->msg_crypto, part, node->parent ? node->parent->part : NULL, numchild); if (status) fprintf (stderr, "Warning: failed to record potential crypto payload (%s).\n", notmuch_status_to_string (status)); } - return node; + return true; } mime_node_t * @@ -347,7 +361,7 @@ mime_node_child (mime_node_t *parent, int child) } else if (GMIME_IS_MESSAGE (parent->part)) { sub = g_mime_message_get_mime_part (GMIME_MESSAGE (parent->part)); } else { - /* This should have been caught by message_part_create */ + /* This should have been caught by _mime_node_set_up_part */ INTERNAL_ERROR ("Unexpected GMimeObject type: %s", g_type_name (G_OBJECT_TYPE (parent->part))); } -- 2.23.0.rc1