From 5345db19f615b9147b3d0d8e04e83767b7457e92 Mon Sep 17 00:00:00 2001 From: Denis Efremov Date: Tue, 27 Aug 2019 23:41:48 +0300 Subject: [PATCH] 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 Message-Id: <20190827204148.20604-1-efremov@linux.com> Signed-off-by: David Gibson --- livetree.c | 3 +-- 1 file changed, 1 insertion(+), 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;