ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcp100: Avoid signed-unsigned integer comparisons.

This commit is contained in:
Andrew Talbot 2012-12-10 18:00:25 +00:00 committed by Alexandre Julliard
parent fa59d1e5d7
commit 4bb92e1897
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/msvcp100/ios.c
View File

@ -2074,7 +2074,7 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot)
}; };
int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary);
int mode_idx; size_t mode_idx;
FILE *f = NULL; FILE *f = NULL;
TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot);
@ -2218,7 +2218,8 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this)
{ {
char ch, buf[128], *to_next; char ch, buf[128], *to_next;
const char *buf_next; const char *buf_next;
int c, i; int c;
size_t i;
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
@ -2247,8 +2248,12 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this)
continue; continue;
} }
for(i--; i>=buf_next-buf; i--) {
ungetc(buf[i], this->file); ptrdiff_t j;
for(j = --i; j >= buf_next-buf; j--)
ungetc(buf[j], this->file);
}
return ch; return ch;
case CODECVT_noconv: case CODECVT_noconv:
return (unsigned char)buf[0]; return (unsigned char)buf[0];
@ -2666,7 +2671,8 @@ unsigned short __thiscall basic_filebuf_wchar_uflow(basic_filebuf_wchar *this)
wchar_t ch, *to_next; wchar_t ch, *to_next;
char buf[128]; char buf[128];
const char *buf_next; const char *buf_next;
int c, i; int c;
size_t i;
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
@ -2692,8 +2698,12 @@ unsigned short __thiscall basic_filebuf_wchar_uflow(basic_filebuf_wchar *this)
if(to_next == &ch) if(to_next == &ch)
continue; continue;
for(i--; i>=buf_next-buf; i--) {
ungetc(buf[i], this->file); ptrdiff_t j;
for(j = --i; j >= buf_next-buf; j--)
ungetc(buf[j], this->file);
}
return ch; return ch;
case CODECVT_noconv: case CODECVT_noconv:
if(i+1 < sizeof(wchar_t)) if(i+1 < sizeof(wchar_t))