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 <torvalds@linux-foundation.org>

diff --git a/parse.c b/parse.c
index 43bf82d86a7885469c691a9100ad516ab996f3c0..78d84a4f4c4b2650dbc6036e4d5314a3a433d461 100644 (file)
--- 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);