From e1a939ac626dda5cf97122cb650c553b2d1fcb2a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 30 Aug 2011 14:38:39 -0700 Subject: [PATCH] Move the "text" nodename hackery out of 'nodename()' It's better to do it in the caller. Debug users may well want the full node name. Signed-off-by: Linus Torvalds --- parse.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/parse.c b/parse.c index 43bf82d..78d84a4 100644 --- a/parse.c +++ b/parse.c @@ -210,12 +210,9 @@ static void entry(const char *name, int size, const char *buffer) static const char *nodename(xmlNode *node, char *buf, int len) { - /* Don't print out the node name if it is "text" */ - if (!strcmp(node->name, "text")) { - node = node->parent; - if (!node || !node->name) - return "root"; - } + + if (!node || !node->name) + return "root"; buf += len; *--buf = 0; @@ -264,6 +261,10 @@ static void visit_one_node(xmlNode *node) if (!len) return; + /* Don't print out the node name if it is "text" */ + if (!strcmp(node->name, "text")) + node = node->parent; + name = nodename(node, buffer, sizeof(buffer)); entry(name, len, content); -- 2.43.0