[janitor] dlls/shlwapi -Wwrite-strings cleanup

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Fixed warnings with gcc option "-Wwrite-strings".

Index: dlls/shlwapi/reg.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/reg.c,v
retrieving revision 1.41
diff -u -r1.41 reg.c
--- dlls/shlwapi/reg.c	11 Sep 2003 02:56:16 -0000	1.41
+++ dlls/shlwapi/reg.c	7 Oct 2003 19:49:45 -0000
@@ -1048,7 +1048,7 @@
 {
   DWORD dwRet = ERROR_SUCCESS, dwDummy;
   HKEY  hSubKey;
-  LPSTR szEmpty = "";
+  char  szEmpty[] = "";
 
   TRACE("(hkey=%p,%s,%s,%ld,%p,%ld)\n", hKey, debugstr_a(lpszSubKey),
           debugstr_a(lpszValue), dwType, pvData, cbData);
Index: dlls/shlwapi/tests/path.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/tests/path.c,v
retrieving revision 1.4
diff -u -r1.4 path.c
--- dlls/shlwapi/tests/path.c	25 Sep 2003 20:29:40 -0000	1.4
+++ dlls/shlwapi/tests/path.c	7 Oct 2003 19:49:45 -0000
@@ -71,7 +71,7 @@
   hash_url(TEST_URL_3);
 }
 
-static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, char* szExpected)
+static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const char* szExpected)
 {
   CHAR szPart[INTERNET_MAX_URL_LENGTH];
   WCHAR wszPart[INTERNET_MAX_URL_LENGTH];
Index: dlls/shlwapi/tests/shreg.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/tests/shreg.c,v
retrieving revision 1.13
diff -u -r1.13 shreg.c
--- dlls/shlwapi/tests/shreg.c	5 Sep 2003 23:08:30 -0000	1.13
+++ dlls/shlwapi/tests/shreg.c	7 Oct 2003 19:49:47 -0000
@@ -40,15 +40,15 @@
 typedef DWORD (WINAPI *SHRegGetPathA_func)(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD);
 static SHRegGetPathA_func pSHRegGetPathA;
 
-static char * sTestpath1 = "%LONGSYSTEMVAR%\\subdir1";
-static char * sTestpath2 = "%FOO%\\subdir1";
+static const char * sTestpath1 = "%LONGSYSTEMVAR%\\subdir1";
+static const char * sTestpath2 = "%FOO%\\subdir1";
 
 static char sExpTestpath1[MAX_PATH];
 static char sExpTestpath2[MAX_PATH];
 static unsigned sExpLen1;
 static unsigned sExpLen2;
 
-static char * sEmptyBuffer ="0123456789";
+static const char * sEmptyBuffer ="0123456789";
 
 /* delete key and all its subkeys */
 static DWORD delete_key( HKEY hkey )
@@ -135,7 +135,7 @@
 	DWORD dwType;
 	char buf[MAX_PATH];
 	DWORD dwRet;
-	char * sTestedFunction = "";
+	const char * sTestedFunction = "";
 	DWORD nUsedBuffer1,nUsedBuffer2;
 
 	ok(! RegOpenKeyExA(HKEY_CURRENT_USER, REG_TEST_KEY, 0,  KEY_QUERY_VALUE, &hKey), "test4 RegOpenKey");

[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux