DeforaNetworks/zzuf
3
0
Fork 0
Code Releases Activity

Fix a bug in the %i formatting and implement %S.

Browse Source
This commit is contained in:
Sam Hocevar 2010-10-06 21:31:40 +00:00 committed by sam
parent b69bd84604
commit 4c3383d7c4
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/libzzuf/debug.c
View File

@ -46,10 +46,10 @@ static void mydebug(char const *format, va_list args);
{ \
char buf[128], *b = buf + 127; \
if (i <= 0) \
append((i = -i) ? "-" : "0", 1); /* XXX: hack here */ \
if (i <= 0) \
append((i = 1 + ~i) ? "-" : "0", 1); /* XXX: hack here */ \
if (i < 0) \
{ \
i = -(i + base); /* XXX: special case for INT_MIN */ \
i = 1 + ~(i + base); /* XXX: special case for INT_MIN */ \
*b-- = hex2char[i % base]; \
i = i / base + 1; \
} \
@ -211,6 +211,33 @@ static void mydebug(char const *format, va_list args)
append(s, l);
}
}
else if(f[0] == 'S')
{
uint16_t *s = va_arg(args, uint16_t *);
if(!s)
append("(nil)", 5);
else
{
int l = 0;
while(s[l])
{
if (s[l] < 128)
{
char tmp = (char)s[l];
append(&tmp, 1);
}
else
{
append("\\u", 2);
append(hex2char + ((s[l] & 0xf000) >> 12), 1);
append(hex2char + ((s[l] & 0xf00) >> 8), 1);
append(hex2char + ((s[l] & 0xf0) >> 4), 1);
append(hex2char + (s[l] & 0xf), 1);
}
l++;
}
}
}
else if(f[0] == '0' && f[1] == '2' && f[2] == 'x')
{
int i = va_arg(args, int);

2
src/libzzuf/lib-win32.c
View File

@ -85,7 +85,7 @@ HANDLE __stdcall NEW(CreateFileW)(LPCWSTR lpFileName, DWORD dwDesiredAccess,
ret = ORIG(CreateFileW)(lpFileName, dwDesiredAccess, dwShareMode,
lpSecurityAttributes, dwCreationDisposition,
dwFlagsAndAttributes, hTemplateFile);
debug("CreateFileW(\"%s\", 0x%x, 0x%x, ..., 0x%x, 0x%x, ...) = [%i]",
debug("CreateFileW(\"%S\", 0x%x, 0x%x, ..., 0x%x, 0x%x, ...) = [%i]",
lpFileName, dwDesiredAccess, dwShareMode, dwCreationDisposition,
dwFlagsAndAttributes, (int)ret);
return ret;