Author: tkreuzer Date: Wed Sep 19 21:03:27 2012 New Revision: 57342
URL: http://svn.reactos.org/svn/reactos?rev=57342&view=rev Log: [CRT] - Fix some MSVC warnings - Comment out files with duplicated functions See CORE-6684
Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/stdio/file.c
Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=5... ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Wed Sep 19 21:03:27 2012 @@ -187,9 +187,9 @@ startup/mingw_helpers.c startup/natstart.c startup/charmax.c - startup/merr.c - startup/atonexit.c - startup/txtmode.c + #startup/merr.c + #startup/atonexit.c + #startup/txtmode.c startup/pesect.c startup/tlsmcrt.c startup/tlsthrd.c
Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?re... ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Wed Sep 19 21:03:27 2012 @@ -309,7 +309,7 @@ unsigned int i; FILE *file;
- for (i = 3; i < max_streams; i++) + for (i = 3; i < (unsigned int)max_streams; i++) { file = get_file(i); if (!file) @@ -386,17 +386,17 @@ *handle_ptr = INVALID_HANDLE_VALUE; } wxflag_ptr++; handle_ptr++; - } + } return TRUE; }
-/* INTERNAL: Set up all file descriptors, - * as well as default streams (stdin, stderr and stdout) +/* INTERNAL: Set up all file descriptors, + * as well as default streams (stdin, stderr and stdout) */ void msvcrt_init_io(void) { STARTUPINFOA si; - int i; + unsigned int i; ioinfo *fdinfo;
InitializeCriticalSection(&file_cs); @@ -1017,7 +1017,7 @@ */ LONG CDECL _lseek(int fd, LONG offset, int whence) { - return _lseeki64(fd, offset, whence); + return (LONG)_lseeki64(fd, offset, whence); }
/********************************************************************* @@ -1563,7 +1563,7 @@ else creation = OPEN_EXISTING; } - + switch( shflags ) { case _SH_DENYRW: @@ -2339,12 +2339,12 @@ wcp = (char *)&wc; for(i=0; i<sizeof(wc); i++) { - if (file->_cnt>0) + if (file->_cnt>0) { file->_cnt--; chp = file->_ptr++; wcp[i] = *chp; - } + } else { j = _filbuf(file); @@ -2363,7 +2363,7 @@ _unlock_file(file); return wc; } - + c = fgetc(file); if ((__mb_cur_max > 1) && isleadbyte(c)) { @@ -2470,7 +2470,7 @@
_lock_file(file); if(file->_cnt) { - int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; + int pcnt=((unsigned)file->_cnt>wrcnt)? wrcnt: file->_cnt; memcpy(file->_ptr, ptr, pcnt); file->_cnt -= pcnt; file->_ptr += pcnt; @@ -2693,7 +2693,7 @@
/* first buffered data */ if(file->_cnt>0) { - int pcnt= (rcnt>file->_cnt)? file->_cnt:rcnt; + int pcnt= (rcnt>(unsigned int)file->_cnt)? file->_cnt:rcnt; memcpy(ptr, file->_ptr, pcnt); file->_cnt -= pcnt; file->_ptr += pcnt; @@ -2720,7 +2720,7 @@ } file->_cnt = _read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; - i = (file->_cnt<rcnt) ? file->_cnt : rcnt; + i = ((unsigned int)file->_cnt<rcnt) ? file->_cnt : rcnt; /* If the buffer fill reaches eof but fread wouldn't, clear eof. */ if (i > 0 && i < file->_cnt) { get_ioinfo(file->_file)->wxflag &= ~WX_ATEOF; @@ -2830,7 +2830,7 @@ /* Discard buffered input */ file->_cnt = 0; file->_ptr = file->_base; - + /* Reset direction of i/o */ if(file->_flag & _IORW) { file->_flag &= ~(_IOREAD|_IOWRT); @@ -2884,7 +2884,7 @@ */ LONG CDECL ftell(FILE* file) { - return _ftelli64(file); + return (LONG)_ftelli64(file); }
/*********************************************************************