glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Partially revert last change

Browse Source 
Thank you Dmitry for spotting it.

* ioctl.c (compare): Partially revert last change - the new
comparison logic was buggy.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-03-20 13:11:51 +01:00
parent 1c2e912cc3
commit feb40c4543
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ioctl.c
View File

@ -37,25 +37,7 @@ compare(const void *a, const void *b)
{
unsigned long code1 = (long) a;
unsigned long code2 = ((struct ioctlent *) b)->code;
/* Simply returning (code1 - code2) may be wrong.
* Exmaple: 0xffffffff - 0 = 0xffffffff = -1.
* Need to shift both values down until they both fit
* in positive int.
*/
while ((code1|code2) > INT_MAX) {
#if INT_MAX == LONG_MAX
/* this case is easy */
code1 >>= 1;
code2 >>= 1;
break;
#else
/* Remove INT_MAX worth of bits, then check again */
code1 >>= sizeof(int) * 8 - 1;
code2 >>= sizeof(int) * 8 - 1;
#endif
}
return (int)code1 - (int)code2;
return (code1 > code2) ? 1 : (code1 < code2) ? -1 : 0;
}
const struct ioctlent *