Fix signed/unsigned warnings in the kernel tests
Francois Gouget
fgouget at free.fr
Tue Dec 17 15:19:01 CST 2002
Changelog:
* dlls/kernel/tests/atom.c,
dlls/kernel/tests/directory.c,
dlls/kernel/tests/environ.c,
dlls/kernel/tests/file.c,
dlls/kernel/tests/path.c,
dlls/kernel/tests/process.c,
Fix (most) signed/unsigned warnings
Use strlen or lstrlenA as appropriate to avoid signed/unsigned
warnings
(but I left the lstrlenW cases untouched because it's not clean
how to fix them properly...)
Index: dlls/kernel/tests/atom.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/atom.c,v
retrieving revision 1.4
diff -u -r1.4 atom.c
--- dlls/kernel/tests/atom.c 9 Oct 2002 18:14:24 -0000 1.4
+++ dlls/kernel/tests/atom.c 17 Dec 2002 20:54:56 -0000
@@ -106,7 +106,8 @@
{
char buf[10];
WCHAR bufW[10];
- int i, len;
+ int i;
+ UINT len;
static const WCHAR resultW[] = {'f','o','o','b','a','r',0,'.','.','.'};
ATOM atom = GlobalAddAtomA( "foobar" );
Index: dlls/kernel/tests/directory.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/directory.c,v
retrieving revision 1.4
diff -u -r1.4 directory.c
--- dlls/kernel/tests/directory.c 12 Dec 2002 03:54:23 -0000 1.4
+++ dlls/kernel/tests/directory.c 17 Dec 2002 20:54:56 -0000
@@ -46,7 +46,7 @@
lstrcpyA(buf, "foo");
len = GetWindowsDirectoryA(buf, len_with_null);
ok(lstrcmpA(buf, "foo") != 0, "should touch the buffer");
- ok(len == lstrlenA(buf), "returned length should be equal to the length of string");
+ ok(len == strlen(buf), "returned length should be equal to the length of string");
ok(len == len_with_null-1, "GetWindowsDirectoryA returned %d, expected %d",
len, len_with_null-1);
}
@@ -109,7 +109,7 @@
lstrcpyA(buf, "foo");
len = GetSystemDirectoryA(buf, len_with_null);
ok(lstrcmpA(buf, "foo") != 0, "should touch the buffer");
- ok(len == lstrlenA(buf), "returned length should be equal to the length of string");
+ ok(len == strlen(buf), "returned length should be equal to the length of string");
ok(len == len_with_null-1, "GetSystemDirectoryW returned %d, expected %d",
len, len_with_null-1);
}
Index: dlls/kernel/tests/environ.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/environ.c,v
retrieving revision 1.3
diff -u -r1.3 environ.c
--- dlls/kernel/tests/environ.c 30 Nov 2002 19:02:22 -0000 1.3
+++ dlls/kernel/tests/environ.c 17 Dec 2002 20:54:56 -0000
@@ -38,25 +38,25 @@
/* Try to retrieve the environment variable we just set */
ret_size = GetEnvironmentVariableA(name, NULL, 0);
- ok(ret_size == lstrlenA(value) + 1,
+ ok(ret_size == strlen(value) + 1,
"should return length with terminating 0 ret_size=%ld", ret_size);
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value));
ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer");
- ok(ret_size == lstrlenA(value) + 1,
+ ok(ret_size == strlen(value) + 1,
"should return length with terminating 0 ret_size=%ld", ret_size);
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1);
ok(lstrcmpA(buf, value) == 0, "should touch the buffer");
- ok(ret_size == lstrlenA(value),
+ ok(ret_size == strlen(value),
"should return length without terminating 0 ret_size=%ld", ret_size);
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name_cased, buf, lstrlenA(value) + 1);
ok(lstrcmpA(buf, value) == 0, "should touch the buffer");
- ok(ret_size == lstrlenA(value),
+ ok(ret_size == strlen(value),
"should return length without terminating 0 ret_size=%ld", ret_size);
/* Remove that environment variable */
@@ -79,7 +79,7 @@
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name_cased, buf, lstrlenA(value) + 1);
ok(lstrcmpA(buf, value) == 0, "should touch the buffer");
- ok(ret_size == lstrlenA(value),
+ ok(ret_size == strlen(value),
"should return length without terminating 0 ret_size=%ld", ret_size);
ret = SetEnvironmentVariableA(name_cased, "");
Index: dlls/kernel/tests/file.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/file.c,v
retrieving revision 1.12
diff -u -r1.12 file.c
--- dlls/kernel/tests/file.c 12 Dec 2002 03:54:01 -0000 1.12
+++ dlls/kernel/tests/file.c 17 Dec 2002 20:54:56 -0000
@@ -47,7 +47,7 @@
char buffer[10000];
long bytes_read;
long bytes_wanted;
- UINT i;
+ long i;
SetFileAttributesA(filename,FILE_ATTRIBUTE_NORMAL); /* be sure to remove stale files */
DeleteFileA( filename );
@@ -68,9 +68,9 @@
bytes_read = _hread( filehandle, buffer, 2 * strlen( sillytext ) );
- ok( strlen( sillytext ) == bytes_read, "file read size error" );
+ ok( lstrlenA( sillytext ) == bytes_read, "file read size error" );
- for (bytes_wanted = 0; bytes_wanted < strlen( sillytext ); bytes_wanted++)
+ for (bytes_wanted = 0; bytes_wanted < lstrlenA( sillytext ); bytes_wanted++)
{
ok( 0 == _llseek( filehandle, 0, FILE_BEGIN ), "_llseek complains" );
ok( _hread( filehandle, buffer, bytes_wanted ) == bytes_wanted, "erratic _hread return value" );
@@ -91,9 +91,9 @@
HFILE filehandle;
char buffer[10000];
long bytes_read;
- UINT bytes_written;
- UINT blocks;
- UINT i;
+ long bytes_written;
+ long blocks;
+ long i;
char *contents;
HLOCAL memory_object;
char checksum[1];
@@ -205,7 +205,7 @@
ok( 0 == _llseek( filehandle, 0, FILE_BEGIN ), "_llseek complains" );
- ok( _hread( filehandle, buffer, strlen( sillytext ) ) == strlen( sillytext ), "erratic _hread return value" );
+ ok( _hread( filehandle, buffer, strlen( sillytext ) ) == lstrlenA( sillytext ), "erratic _hread return value" );
ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains" );
@@ -235,7 +235,7 @@
ok( 0 == _llseek( filehandle, 0, FILE_BEGIN ), "_llseek complains" );
- ok( _hread( filehandle, buffer, strlen( sillytext ) ) == strlen( sillytext ), "erratic _hread return value" );
+ ok( _hread( filehandle, buffer, strlen( sillytext ) ) == lstrlenA( sillytext ), "erratic _hread return value" );
ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains" );
@@ -250,7 +250,7 @@
ok( 0 == _llseek( filehandle, 0, FILE_BEGIN ), "_llseek complains" );
- ok( _hread( filehandle, buffer, strlen( sillytext ) ) == strlen( sillytext ), "erratic _hread return value" );
+ ok( _hread( filehandle, buffer, strlen( sillytext ) ) == lstrlenA( sillytext ), "erratic _hread return value" );
ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains" );
@@ -359,7 +359,7 @@
bytes_read = _lread( filehandle, buffer, 2 * strlen( sillytext ) );
- ok( strlen( sillytext ) == bytes_read, "file read size error" );
+ ok( lstrlenA( sillytext ) == bytes_read, "file read size error" );
for (bytes_wanted = 0; bytes_wanted < strlen( sillytext ); bytes_wanted++)
{
@@ -382,9 +382,9 @@
HFILE filehandle;
char buffer[10000];
long bytes_read;
- UINT bytes_written;
- UINT blocks;
- UINT i;
+ long bytes_written;
+ long blocks;
+ long i;
char *contents;
HLOCAL memory_object;
char checksum[1];
Index: dlls/kernel/tests/path.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/path.c,v
retrieving revision 1.11
diff -u -r1.11 path.c
--- dlls/kernel/tests/path.c 11 Dec 2002 00:16:31 -0000 1.11
+++ dlls/kernel/tests/path.c 17 Dec 2002 20:54:57 -0000
@@ -178,9 +178,9 @@
/* split path into leading directory, and 8.3 filename */
static void test_SplitShortPathA(CHAR *path,CHAR *dir,CHAR *eight,CHAR *three) {
- DWORD len,done,error;
- DWORD ext,fil;
- INT i;
+ int done,error;
+ int ext,fil;
+ int len,i;
len=lstrlenA(path);
ext=len; fil=len; done=0; error=0;
/* walk backwards over path looking for '.' or '\\' seperators */
@@ -813,7 +813,7 @@
len = GetTempPathA(MAX_PATH, buf);
ok(len <= MAX_PATH, "should fit into MAX_PATH");
ok(lstrcmpiA(buf, tmp_dir) == 0, "expected [%s], got [%s]",tmp_dir,buf);
- ok(len == lstrlenA(buf), "returned length should be equal to the length of string");
+ ok(len == strlen(buf), "returned length should be equal to the length of string");
/* Some versions of Windows touch the buffer, some don't so we don't
* test that. Also, NT sometimes exagerates the required buffer size
@@ -834,7 +834,7 @@
lstrcpyA(buf, "foo");
len = GetTempPathA(len, buf);
ok(lstrcmpiA(buf, tmp_dir) == 0, "expected [%s], got [%s]",tmp_dir,buf);
- ok(len == lstrlenA(buf), "returned length should be equal to the length of string");
+ ok(len == strlen(buf), "returned length should be equal to the length of string");
}
static void test_GetTempPathW(char* tmp_dir)
Index: dlls/kernel/tests/process.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/process.c,v
retrieving revision 1.5
diff -u -r1.5 process.c
--- dlls/kernel/tests/process.c 22 Jun 2002 00:08:10 -0000 1.5
+++ dlls/kernel/tests/process.c 17 Dec 2002 20:54:57 -0000
@@ -57,9 +57,8 @@
static char* encodeA(const char* str)
{
- size_t len;
char* ptr;
- int i;
+ size_t len,i;
if (!str) return "";
len = strlen(str) + 1;
@@ -72,9 +71,8 @@
static char* encodeW(const WCHAR* str)
{
- size_t len;
char* ptr;
- int i;
+ size_t len,i;
if (!str) return "";
len = lstrlenW(str) + 1;
@@ -96,9 +94,8 @@
static char* decodeA(const char* str)
{
- size_t len;
char* ptr;
- int i;
+ size_t len,i;
len = strlen(str) / 2;
if (!len--) return NULL;
@@ -346,7 +345,7 @@
*/
#define okChildInt(sect, key, expect) \
do { \
- int result = GetPrivateProfileIntA((sect), (key), !(expect), resfile); \
+ UINT result = GetPrivateProfileIntA((sect), (key), !(expect), resfile); \
ok(result == expect, "%s:%s expected %d, but got %d\n", (sect), (key), (int)(expect), result); \
} while (0)
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
1 + e ^ ( i * pi ) = 0
More information about the wine-patches
mailing list