FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the "text" nodename hackery out of 'nodename()'

Browse Source 
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>
This commit is contained in:
Linus Torvalds 2011-08-30 14:38:39 -07:00
parent 4b3bd4b739
commit e1a939ac62
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
parse.c
View File

@ -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);