aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Efremov <efremov@linux.com>2019-08-27 23:41:48 +0300
committerDavid Gibson <david@gibson.dropbear.id.au>2019-08-28 13:57:27 +1000
commit5345db19f615b9147b3d0d8e04e83767b7457e92 (patch)
tree07d0b18ba5c1e78c167440a96303d31a6afb1181
parentb8d6eca78210952c6d93235c38ebd5836d6409c4 (diff)
downloaddtc-5345db19f615b9147b3d0d8e04e83767b7457e92.zip
dtc-5345db19f615b9147b3d0d8e04e83767b7457e92.tar.gz
dtc-5345db19f615b9147b3d0d8e04e83767b7457e92.tar.bz2
livetree: simplify condition in get_node_by_path
The "strlen && strprefixeq" check in get_node_by_path is excessive, since strlen is checked in strprefixeq macro internally. Thus, "strlen(child->name) == p-path" conjunct duplicates after macro expansion and could be removed. Signed-off-by: Denis Efremov <efremov@linux.com> Message-Id: <20190827204148.20604-1-efremov@linux.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--livetree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/livetree.c b/livetree.c
index 0c03999..032df58 100644
--- a/livetree.c
+++ b/livetree.c
@@ -526,8 +526,7 @@ struct node *get_node_by_path(struct node *tree, const char *path)
p = strchr(path, '/');
for_each_child(tree, child) {
- if (p && (strlen(child->name) == p-path) &&
- strprefixeq(path, p - path, child->name))
+ if (p && strprefixeq(path, p - path, child->name))
return get_node_by_path(child, p+1);
else if (!p && streq(path, child->name))
return child;