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

* Looks like r24456 was a bit premature: with string attributes, it makes sense

Browse Source 
to ignore a trailing null byte, which the code now didn't do anymore.
* This caused bug #2054.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24888 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-04-10 11:43:45 +00:00
parent 875757adef
commit cdde324d77
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
View File

@ -2311,8 +2311,16 @@ compareKeys(type_code type, const void *key1, int keyLength1,
case B_STRING_TYPE: case B_STRING_TYPE:
{ {
int result = memcmp(key1, key2, min_c(keyLength1, keyLength2)); int result = memcmp(key1, key2, min_c(keyLength1, keyLength2));
if (result == 0) if (result == 0) {
// ignore trailing null bytes
if ((keyLength1 == keyLength2 + 1
&& ((uint8 *)key1)[keyLength2] == '\0')
|| (keyLength2 == keyLength1 + 1
&& ((uint8 *)key2)[keyLength1] == '\0'))
return 0;
result = keyLength1 - keyLength2; result = keyLength1 - keyLength2;
}
return result; return result;
} }