From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH 8/9] cli: simplify mime node walk
Date: Fri, 6 Jan 2017 22:14:49 +0200 [thread overview]
Message-ID: <067056a53ebd1343f502ae1df876d92d9b7ba20b.1483733461.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1483733461.git.jani@nikula.org>
In-Reply-To: <cover.1483733461.git.jani@nikula.org>
The function is more straighforward to read when it's clear that the
only non-NULL return is at one place. No functional changes.
---
mime-node.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/mime-node.c b/mime-node.c
index c9b82330f6e0..f719422ec678 100644
--- a/mime-node.c
+++ b/mime-node.c
@@ -322,20 +322,21 @@ mime_node_child (mime_node_t *parent, int child)
static mime_node_t *
_mime_node_seek_dfs_walk (mime_node_t *node, int *n)
{
- mime_node_t *ret = NULL;
int i;
if (*n == 0)
return node;
*n -= 1;
- for (i = 0; i < node->nchildren && !ret; i++) {
+ for (i = 0; i < node->nchildren; i++) {
mime_node_t *child = mime_node_child (node, i);
- ret = _mime_node_seek_dfs_walk (child, n);
- if (!ret)
- talloc_free (child);
+ mime_node_t *ret = _mime_node_seek_dfs_walk (child, n);
+ if (ret)
+ return ret;
+
+ talloc_free (child);
}
- return ret;
+ return NULL;
}
mime_node_t *
--
2.11.0
next prev parent reply other threads:[~2017-01-06 20:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-06 20:14 [PATCH 0/9] cli/show: refactoring and cleanup Jani Nikula
2017-01-06 20:14 ` [PATCH 1/9] cli/show: detangle overloading of params.part for single message display Jani Nikula
2017-03-11 14:06 ` David Bremner
2017-01-06 20:14 ` [PATCH 2/9] cli/show: remove unused raw member from show parameters struct Jani Nikula
2017-01-06 20:14 ` [PATCH 3/9] cli/show: consistently use format_sel for checking the format Jani Nikula
2017-01-06 20:14 ` [PATCH 4/9] cli/show: use a table for choosing the formatter Jani Nikula
2017-01-06 20:14 ` [PATCH 5/9] cli/show: rename format_sel to simply format Jani Nikula
2017-01-06 20:14 ` [PATCH 6/9] cli/show: group --entire-thread option handling into one place Jani Nikula
2017-01-06 20:14 ` [PATCH 7/9] cli/show: move formatter structs closer to where they're needed Jani Nikula
2017-01-06 20:14 ` Jani Nikula [this message]
2017-01-06 20:14 ` [PATCH 9/9] cli: do not initialize zero values with designated initializers Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=067056a53ebd1343f502ae1df876d92d9b7ba20b.1483733461.git.jani@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).