[janitor] dlls/wininet -Wwrite-strings cleanup
Daniel Marmier
d.marmier at bluewin.ch
Tue Oct 7 15:52:31 CDT 2003
Fixed warnings with gcc option "-Wwrite-strings".
-------------- next part --------------
Index: dlls/wininet/cookie.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/cookie.c,v
retrieving revision 1.3
diff -u -r1.3 cookie.c
--- dlls/wininet/cookie.c 5 Sep 2003 23:08:28 -0000 1.3
+++ dlls/wininet/cookie.c 7 Oct 2003 20:41:03 -0000
@@ -338,7 +338,7 @@
* It'd be nice to know what exactly is going on, M$ tracking users? Does this need
* to be unique? Should I generate a random number here? etc.
*/
- char *TrackingString = "MtrxTrackingID=01234567890123456789012345678901";
+ const char *TrackingString = "MtrxTrackingID=01234567890123456789012345678901";
TRACE("(%s, %s, %p, %p)\n", debugstr_a(lpszUrl),debugstr_a(lpszCookieName),
lpCookieData, lpdwSize);
Index: dlls/wininet/http.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/http.c,v
retrieving revision 1.42
diff -u -r1.42 http.c
--- dlls/wininet/http.c 25 Sep 2003 20:25:22 -0000 1.42
+++ dlls/wininet/http.c 7 Oct 2003 20:41:14 -0000
@@ -388,7 +388,7 @@
static UINT HTTP_Base64( LPCSTR bin, LPSTR base64 )
{
UINT n = 0, x;
- static LPSTR HTTP_Base64Enc =
+ static LPCSTR HTTP_Base64Enc =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
while( bin[0] )
@@ -433,7 +433,8 @@
static LPSTR HTTP_EncodeBasicAuth( LPCSTR username, LPCSTR password)
{
UINT len;
- LPSTR in, out, szBasic = "Basic ";
+ LPSTR in, out;
+ LPCSTR szBasic = "Basic ";
len = strlen( username ) + 1 + strlen ( password ) + 1;
in = HeapAlloc( GetProcessHeap(), 0, len );
@@ -466,8 +467,9 @@
{
HTTPHEADERA hdr;
INT index;
+ char field[] = "Proxy-Authorization";
- hdr.lpszField = "Proxy-Authorization";
+ hdr.lpszField = field;
hdr.lpszValue = HTTP_EncodeBasicAuth( username, password );
hdr.wFlags = HDR_ISREQUEST;
hdr.wCount = 0;
@@ -496,7 +498,8 @@
{
char buf[MAXHOSTNAME];
char proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */
- char* url, *szNul = "";
+ char* url;
+ char szNul[] = "";
URL_COMPONENTSA UrlComponents;
memset( &UrlComponents, 0, sizeof UrlComponents );
Index: dlls/wininet/internet.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/internet.c,v
retrieving revision 1.68
diff -u -r1.68 internet.c
--- dlls/wininet/internet.c 25 Sep 2003 20:25:22 -0000 1.68
+++ dlls/wininet/internet.c 7 Oct 2003 20:41:25 -0000
@@ -221,7 +221,7 @@
{
HKEY key;
DWORD r, keytype, len, enabled;
- LPSTR lpszInternetSettings =
+ LPCSTR lpszInternetSettings =
"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings";
r = RegOpenKeyA(HKEY_CURRENT_USER, lpszInternetSettings, &key);
@@ -240,7 +240,8 @@
NULL, &len);
if( (r == ERROR_SUCCESS) && len && (keytype == REG_SZ) )
{
- LPSTR szProxy, p, szHttp = "http=";
+ LPSTR szProxy, p;
+ LPCSTR szHttp = "http=";
szProxy=HeapAlloc( GetProcessHeap(), 0, len+1 );
RegQueryValueExA( key, "ProxyServer", NULL, &keytype,
More information about the wine-patches
mailing list