Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed off-by-one error that prevented finding nodes using wildcard names, like DVB* 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17467 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen 2006-05-15 18:43:36 +00:00
parent 5fbc62e3eb
commit 4cf01e2ecc
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/servers/media/NodeManager.cpp
View File

@ -474,18 +474,17 @@ NodeManager::GetLiveNodes(Stack<live_node_info> *livenodes, int32 maxcount, cons
// determine the count of byte to compare when checking for a name with(out) wildcard
if (name) {
namelen = strlen(name);
if (name[namelen] == '*')
if (namelen > 0 && name[namelen - 1] == '*')
namelen--; // compares without the '*'
else
namelen++; // also compares the terminating NULL
} else
} else {
namelen = 0;
}
for (fRegisteredNodeMap->Rewind(); (maxcount > 0) && fRegisteredNodeMap->GetNext(&rn); ) {
if ((rn->kinds & require_kinds) != require_kinds)
continue;
if (namelen) {
if (0 != memcmp(name, rn->name, namelen))
if (0 != strncmp(name, rn->name, namelen))
continue;
}
if (inputformat) {
@ -746,12 +745,11 @@ NodeManager::GetDormantNodes(dormant_node_info * out_info,
// determine the count of byte to compare when checking for a name with(out) wildcard
if (name) {
namelen = strlen(name);
if (name[namelen] == '*')
if (namelen > 0 && name[namelen - 1] == '*')
namelen--; // compares without the '*'
else
namelen++; // also compares the terminating NULL
} else
} else {
namelen = 0;
}
maxcount = *io_count;
*io_count = 0;
@ -767,7 +765,7 @@ NodeManager::GetDormantNodes(dormant_node_info * out_info,
if ((dfi->kinds & deny_kinds) != 0)
continue;
if (namelen) {
if (0 != memcmp(name, dfi->name, namelen))
if (0 != strncmp(name, dfi->name, namelen))
continue;
}
if (has_input) {