Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 15:15:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing 2 more fualt in msvcrt *printf api

Browse source 
svn path=/trunk/; revision=22247
This commit is contained in:
Magnus Olsen 2006-06-06 12:45:05 +00:00
parent 21baa4ddb6
commit 7894ff05b8
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/lib/rtl/sprintf.c
View file

@ -115,12 +115,12 @@ number(char * buf, char * end, long long num, int base, int size, int precision,
size--;
}
}
if (type & SPECIAL) {
if (base == 16)
size -= 2;
else if (base == 8)
size--;
}
}
i = 0;
if ((num == 0) && (precision !=0))
tmp[i++] = '0';
@ -141,12 +141,9 @@ number(char * buf, char * end, long long num, int base, int size, int precision,
*buf = sign;
++buf;
}
if (type & SPECIAL) {
if (base==8) {
if (buf <= end)
*buf = '0';
++buf;
} else if (base==16) {
if (base==16) {
if (buf <= end)
*buf = '0';
++buf;
@ -155,6 +152,7 @@ number(char * buf, char * end, long long num, int base, int size, int precision,
++buf;
}
}
if (!(type & LEFT)) {
while (size-- > 0) {
if (buf <= end)
@ -177,6 +175,7 @@ number(char * buf, char * end, long long num, int base, int size, int precision,
*buf = ' ';
++buf;
}
return buf;
}

14
reactos/lib/rtl/swprintf.c
View file

@ -115,12 +115,11 @@ number(wchar_t * buf, wchar_t * end, long long num, int base, int size, int prec
size--;
}
}
if (type & SPECIAL) {
if (base == 16)
size -= 2;
else if (base == 8)
size--;
}
}
i = 0;
if ((num == 0) && (precision !=0))
tmp[i++] = L'0';
@ -141,12 +140,9 @@ number(wchar_t * buf, wchar_t * end, long long num, int base, int size, int prec
*buf = sign;
++buf;
}
if (type & SPECIAL) {
if (base==8) {
if (buf <= end)
*buf = L'0';
++buf;
} else if (base==16) {
if (base==16) {
if (buf <= end)
*buf = L'0';
++buf;
@ -177,6 +173,8 @@ number(wchar_t * buf, wchar_t * end, long long num, int base, int size, int prec
*buf = L' ';
++buf;
}
return buf;
}