msvcrt: Sign-compare warnings fix
Andrew Talbot
andrew.talbot at talbotville.com
Tue Oct 21 15:44:27 CDT 2008
Changelog:
msvcrt: Sign-compare warnings fix.
diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c
index 21bcf16..267e0e1 100644
--- a/dlls/msvcrt/console.c
+++ b/dlls/msvcrt/console.c
@@ -121,7 +121,7 @@ int CDECL _getch(void)
do {
if (ReadConsoleInputA(MSVCRT_console_in, &ir, 1, &count))
{
- int i;
+ unsigned int i;
/* Only interested in ASCII chars */
if (ir.EventType == KEY_EVENT &&
ir.Event.KeyEvent.bKeyDown)
diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
index 296c656..adcd18c 100644
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@@ -478,7 +478,8 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except)
{
if (handler != MSVCRT_SIG_IGN)
{
- int i, float_signal = _FPE_INVALID;
+ unsigned int i;
+ int float_signal = _FPE_INVALID;
sighandlers[MSVCRT_SIGFPE] = MSVCRT_SIG_DFL;
for (i = 0; i < sizeof(float_exception_map) /
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index c78e46c..7c0f74d 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -1686,7 +1686,7 @@ static int read_i(int fd, void *buf, unsigned int count)
{
if (MSVCRT_fdesc[fd].wxflag & WX_TEXT)
{
- int i;
+ DWORD i;
/* in text mode, a ctrl-z signals EOF */
for (i=0; i<num_read; i++)
{
@@ -2281,7 +2281,8 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file)
if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT))
{
MSVCRT_wchar_t wc;
- int i,j;
+ unsigned int i;
+ int j;
char *chp, *wcp;
wcp = (char *)&wc;
for(i=0; i<sizeof(wc); i++)
@@ -2324,7 +2325,8 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file)
int CDECL MSVCRT__getw(MSVCRT_FILE* file)
{
char *ch;
- int i, j, k;
+ int i, k;
+ unsigned int j;
ch = (char *)&i;
for (j=0; j<sizeof(int); j++) {
k = MSVCRT_fgetc(file);
diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c
index 1d9fae7..317d7d3 100644
--- a/dlls/msvcrt/undname.c
+++ b/dlls/msvcrt/undname.c
@@ -348,7 +348,7 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t
struct datatype_t ct;
struct array arg_collect;
char* args_str = NULL;
- int i;
+ unsigned int i;
str_array_init(&arg_collect);
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 7eab20b..8cd843d 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1034,7 +1034,7 @@ INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc )
*/
INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc)
{
- INT size = 0;
+ unsigned int size = 0;
if(!wcDest || !numElement)
return MSVCRT_EINVAL;
@@ -1067,7 +1067,7 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con
INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc,
MSVCRT_size_t count )
{
- INT size = 0;
+ unsigned int size = 0;
if (!wcDest || !numElement)
return MSVCRT_EINVAL;
More information about the wine-patches
mailing list