Patch from Julian Foad:
Use getDisplayName instead of duplicated code. Replace unnecessary node lookups by name with direct access.
This commit is contained in:
parent
1d82339fd8
commit
2a1ef0621e
2 changed files with 4 additions and 18 deletions
|
@ -178,12 +178,7 @@ void HttpdChannel::foundTerminator (void) {
|
|||
|
||||
for (int i = 0; i < node->nChildren(); i++) {
|
||||
SGPropertyNode *child = node->getChild(i);
|
||||
string name = child->getName();
|
||||
if ( node->getChild(name.c_str(), 1) ) {
|
||||
char buf[16];
|
||||
sprintf(buf, "[%d]", child->getIndex());
|
||||
name += buf;
|
||||
}
|
||||
string name = child->getDisplayName(true);
|
||||
string line = "";
|
||||
if ( child->nChildren() > 0 ) {
|
||||
line += "<B><A HREF=\"";
|
||||
|
|
|
@ -201,15 +201,7 @@ TelnetChannel::foundTerminator()
|
|||
for (int i = 0; i < dir->nChildren(); i++)
|
||||
{
|
||||
SGPropertyNode * child = dir->getChild(i);
|
||||
string name = child->getName();
|
||||
string line = name;
|
||||
|
||||
if (dir->getChild( name.c_str(), 1 ))
|
||||
{
|
||||
char buf[16];
|
||||
sprintf(buf, "[%d]", child->getIndex());
|
||||
line += buf;
|
||||
}
|
||||
string line = child->getDisplayName(true);
|
||||
|
||||
if ( child->nChildren() > 0 )
|
||||
{
|
||||
|
@ -219,10 +211,9 @@ TelnetChannel::foundTerminator()
|
|||
{
|
||||
if (mode == PROMPT)
|
||||
{
|
||||
string value = dir->getStringValue( name.c_str(), "" );
|
||||
string value = child->getStringValue();
|
||||
line += " =\t'" + value + "'\t(";
|
||||
line += getValueTypeString(
|
||||
dir->getNode( name.c_str() ) );
|
||||
line += getValueTypeString( child );
|
||||
line += ")";
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue