KERNEL32: some warning fixes for the regression tests

Mike McCormack mike at codeweavers.com
Mon May 30 07:48:37 CDT 2005


ChangeLog:
* some warning fixes for the regression tests
-------------- next part --------------
Index: dlls/kernel/tests/drive.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/drive.c,v
retrieving revision 1.4
diff -u -p -r1.4 drive.c
--- dlls/kernel/tests/drive.c	23 Jan 2004 20:50:35 -0000	1.4
+++ dlls/kernel/tests/drive.c	30 May 2005 12:48:28 -0000
@@ -25,7 +25,7 @@
 #include "winbase.h"
 #include "winerror.h"
 
-void test_GetDriveTypeA(void)
+static void test_GetDriveTypeA(void)
 {
     char drive[] = "?:\\";
     DWORD logical_drives;
@@ -48,7 +48,7 @@ void test_GetDriveTypeA(void)
     }
 }
 
-void test_GetDriveTypeW(void)
+static void test_GetDriveTypeW(void)
 {
     WCHAR drive[] = {'?',':','\\',0};
     DWORD logical_drives;
@@ -76,7 +76,7 @@ void test_GetDriveTypeW(void)
     }
 }
 
-void test_GetDiskFreeSpaceA(void)
+static void test_GetDiskFreeSpaceA(void)
 {
     BOOL ret;
     DWORD sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters;
@@ -122,7 +122,7 @@ void test_GetDiskFreeSpaceA(void)
     }
 }
 
-void test_GetDiskFreeSpaceW(void)
+static void test_GetDiskFreeSpaceW(void)
 {
     BOOL ret;
     DWORD sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters;
Index: dlls/kernel/tests/format_msg.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/format_msg.c,v
retrieving revision 1.8
diff -u -p -r1.8 format_msg.c
--- dlls/kernel/tests/format_msg.c	20 Apr 2004 01:12:17 -0000	1.8
+++ dlls/kernel/tests/format_msg.c	30 May 2005 12:48:28 -0000
@@ -25,7 +25,7 @@
 
 /* #define ok(cond,failstr) if(!(cond)) {printf("line %d : %s\n",__LINE__,failstr);exit(1);} */
 
-DWORD doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id,
+static DWORD doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id,
            LPSTR out, DWORD outsize, ... )
 {
     va_list list;
@@ -38,7 +38,7 @@ DWORD doit(DWORD flags, LPCVOID src, DWO
     return r;
 }
 
-void test_message_from_string(void)
+static void test_message_from_string(void)
 {
     CHAR out[0x100] = {0};
     DWORD r;
Index: dlls/kernel/tests/locale.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/locale.c,v
retrieving revision 1.35
diff -u -p -r1.35 locale.c
--- dlls/kernel/tests/locale.c	2 Mar 2005 10:11:22 -0000	1.35
+++ dlls/kernel/tests/locale.c	30 May 2005 12:48:29 -0000
@@ -104,7 +104,7 @@ static void InitFunctionPointers(void)
            (label), (received), (expected))
 
 #define BUFFER_SIZE    128
-char GlobalBuffer[BUFFER_SIZE]; /* Buffer used by callback function */
+static char GlobalBuffer[BUFFER_SIZE]; /* Buffer used by callback function */
 #define COUNTOF(x) (sizeof(x)/sizeof(x)[0])
 
 #define EXPECT_LEN(len) ok(ret == (len), "Expected Len %d, got %d\n", (len), ret)
@@ -759,7 +759,7 @@ static BOOL CALLBACK EnumTimeFormatsProc
   return FALSE;
 }
 
-void test_EnumTimeFormats()
+static void test_EnumTimeFormats()
 {
   int ret;
   LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
@@ -957,7 +957,7 @@ static void test_CompareStringA()
     ok(ret == 2, "aLu\\0ZkUtZ vs aLu\\0ZkUtZ\\0A expected 2, got %d\n", ret);
 }
 
-void test_LCMapStringA(void)
+static void test_LCMapStringA(void)
 {
     int ret, ret2;
     char buf[256], buf2[256];
@@ -1126,7 +1126,7 @@ void test_LCMapStringA(void)
        "unexpected error code %ld\n", GetLastError());
 }
 
-void test_LCMapStringW(void)
+static void test_LCMapStringW(void)
 {
     int ret, ret2;
     WCHAR buf[256], buf2[256];
Index: dlls/kernel/tests/path.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/path.c,v
retrieving revision 1.28
diff -u -p -r1.28 path.c
--- dlls/kernel/tests/path.c	16 Mar 2005 19:49:57 -0000	1.28
+++ dlls/kernel/tests/path.c	30 May 2005 12:48:29 -0000
@@ -66,8 +66,9 @@ typedef struct {
          for wine.  It is not very pretty, but it sure beats duplicating this
          function lots of times
 */
-static void test_ValidPathA(CHAR *curdir, CHAR *subdir, CHAR *filename,
-                         CHAR *shortstr, SLpassfail *passfail, CHAR *errstr) {
+static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR *filename,
+                         CHAR *shortstr, SLpassfail *passfail, const CHAR *errstr)
+{
   CHAR tmpstr[MAX_PATH],
        fullpath[MAX_PATH],      /*full path to the file (not short/long) */
        subpath[MAX_PATH],       /*relative path to the file */
@@ -208,8 +209,8 @@ static void test_SplitShortPathA(CHAR *p
 }
 
 /* Check that GetShortPathNameA returns a valid 8.3 path */
-static void test_LongtoShortA(CHAR *teststr,CHAR *goodstr,
-                              CHAR *ext,CHAR *errstr) {
+static void test_LongtoShortA(CHAR *teststr,const CHAR *goodstr,
+                              const CHAR *ext,const CHAR *errstr) {
   CHAR dir[MAX_PATH],eight[MAX_PATH],three[MAX_PATH];
 
   test_SplitShortPathA(teststr,dir,eight,three);
@@ -263,7 +264,7 @@ static void test_FunnyChars(CHAR *curdir
 
 /* Routine to test that SetCurrentDirectory behaves as expected. */
 static void test_setdir(CHAR *olddir,CHAR *newdir,
-                        CHAR *cmprstr, INT pass,CHAR *errstr)
+                        CHAR *cmprstr, INT pass, const CHAR *errstr)
 {
   CHAR tmppath[MAX_PATH], *dirptr;
   DWORD val,len,chklen;


More information about the wine-patches mailing list