WININET: fix some warnings

Mike McCormack mike at codeweavers.com
Mon Jun 13 08:26:36 CDT 2005 

ChangeLog:
* fix some warnings
-------------- next part --------------
? dlls/wininet/rsrc.res.WlklUj
Index: dlls/wininet/ftp.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/ftp.c,v
retrieving revision 1.55
diff -u -p -r1.55 ftp.c
--- dlls/wininet/ftp.c	21 Apr 2005 17:18:50 -0000	1.55
+++ dlls/wininet/ftp.c	13 Jun 2005 13:28:10 -0000
@@ -1854,7 +1854,7 @@ lend:
  *   NULL on failure
  *
  */
-BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
+static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
 	INTERNET_STATUS_CALLBACK lpfnStatusCB, LPWININETHANDLEHEADER hdr, DWORD dwContext)
 {
     	DWORD len;
Index: dlls/wininet/http.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/http.c,v
retrieving revision 1.98
diff -u -p -r1.98 http.c
--- dlls/wininet/http.c	28 Mar 2005 14:58:52 -0000	1.98
+++ dlls/wininet/http.c	13 Jun 2005 13:28:10 -0000
@@ -490,7 +490,7 @@ end:
 static UINT HTTP_Base64( LPCWSTR bin, LPWSTR base64 )
 {
     UINT n = 0, x;
-    static LPSTR HTTP_Base64Enc = 
+    static LPCSTR HTTP_Base64Enc = 
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
     while( bin[0] )
@@ -840,7 +840,7 @@ lend:
 /***********************************************************************
  *           HTTP_HttpQueryInfoW (internal)
  */
-BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel,
+static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel,
 	LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD lpdwIndex)
 {
     LPHTTPHEADERW lphttpHdr = NULL;
Index: dlls/wininet/internet.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/internet.c,v
retrieving revision 1.125
diff -u -p -r1.125 internet.c
--- dlls/wininet/internet.c	5 Jun 2005 19:19:43 -0000	1.125
+++ dlls/wininet/internet.c	13 Jun 2005 13:28:10 -0000
@@ -102,9 +102,6 @@ static LPWORKREQUEST lpHeadWorkQueue;
 static LPWORKREQUEST lpWorkQueueTail;
 static HMODULE WININET_hModule;
 
-extern void URLCacheContainers_CreateDefaults(void);
-extern void URLCacheContainers_DeleteAll(void);
-
 #define HANDLE_CHUNK_SIZE 0x10
 
 static CRITICAL_SECTION WININET_cs;
@@ -373,7 +370,7 @@ static BOOL INTERNET_ConfigureProxyFromR
 {
     HKEY key;
     DWORD r, keytype, len, enabled;
-    LPSTR lpszInternetSettings =
+    LPCSTR lpszInternetSettings =
         "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings";
     static const WCHAR szProxyServer[] = { 'P','r','o','x','y','S','e','r','v','e','r', 0 };
 
Index: dlls/wininet/internet.h
===================================================================
RCS file: /home/wine/wine/dlls/wininet/internet.h,v
retrieving revision 1.35
diff -u -p -r1.35 internet.h
--- dlls/wininet/internet.h	23 Dec 2004 11:18:29 -0000	1.35
+++ dlls/wininet/internet.h	13 Jun 2005 13:28:10 -0000
@@ -469,6 +469,9 @@ BOOL NETCON_recv(WININET_NETCONNECTION *
 		int *recvd /* out */);
 BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer);
 
+extern void URLCacheContainers_CreateDefaults(void);
+extern void URLCacheContainers_DeleteAll(void);
+
 #define MAX_REPLY_LEN	 	0x5B4
 
 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */
Index: dlls/wininet/urlcache.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/urlcache.c,v
retrieving revision 1.30
diff -u -p -r1.30 urlcache.c
--- dlls/wininet/urlcache.c	4 May 2005 10:36:43 -0000	1.30
+++ dlls/wininet/urlcache.c	13 Jun 2005 13:28:11 -0000
@@ -548,7 +548,7 @@ static void URLCacheContainer_DeleteCont
     HeapFree(GetProcessHeap(), 0, pContainer);
 }
 
-void URLCacheContainers_CreateDefaults()
+void URLCacheContainers_CreateDefaults(void)
 {
     static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0};
     static const WCHAR UrlPrefix[] = {0};
@@ -604,7 +604,7 @@ void URLCacheContainers_CreateDefaults()
     }
 }
 
-void URLCacheContainers_DeleteAll()
+void URLCacheContainers_DeleteAll(void)
 {
     while(!list_empty(&UrlContainers))
         URLCacheContainer_DeleteContainer(
Index: dlls/wininet/tests/http.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/tests/http.c,v
retrieving revision 1.23
diff -u -p -r1.23 http.c
--- dlls/wininet/tests/http.c	24 May 2005 11:43:35 -0000	1.23
+++ dlls/wininet/tests/http.c	13 Jun 2005 13:28:11 -0000
@@ -19,7 +19,7 @@
 
 int goon = 0;
 
-VOID WINAPI callback(
+static VOID WINAPI callback(
      HINTERNET hInternet,
      DWORD dwContext,
      DWORD dwInternetStatus,
@@ -85,10 +85,11 @@ VOID WINAPI callback(
             break;
     }
 
-    trace("Callback %p 0x%lx %s(%li) %p %ld\n",hInternet,dwContext,name,dwInternetStatus,lpvStatusInformation,dwStatusInformationLength);
+    trace("Callback %p 0x%lx %s(%li) %p %ld\n",hInternet,dwContext,name,
+          dwInternetStatus,lpvStatusInformation,dwStatusInformationLength);
 }
 
-void winapi_test(int flags)
+static void winapi_test(int flags)
 {
     DWORD rc;
     CHAR buffer[4000];
@@ -216,7 +217,7 @@ abort:
     }
 }
 
-void InternetOpenUrlA_test(void)
+static void InternetOpenUrlA_test(void)
 {
   HINTERNET myhinternet, myhttp;
   char buffer[0x400];
@@ -261,7 +262,7 @@ void InternetOpenUrlA_test(void)
   trace("read 0x%08lx bytes\n",totalbytes);
 }
   
-void InternetCrackUrl_test(void)
+static void InternetCrackUrl_test(void)
 {
   URL_COMPONENTSA urlComponents;
   char protocol[32], hostName[1024], userName[1024];
@@ -328,7 +329,7 @@ void InternetCrackUrl_test(void)
   ok(InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents),"InternetCrackUrl failed with GLE 0x%lx\n",GetLastError());
 }
 
-void InternetCrackUrlW_test(void)
+static void InternetCrackUrlW_test(void)
 {
     WCHAR url[] = {
         'h','t','t','p',':','/','/','1','9','2','.','1','6','8','.','0','.','2','2','/',
@@ -416,7 +417,7 @@ void InternetCrackUrlW_test(void)
     ok( comp.dwExtraInfoLength == 29, "extra length wrong\n");
 }
 
-static void InternetTimeFromSystemTimeA_test()
+static void InternetTimeFromSystemTimeA_test(void)
 {
     BOOL ret;
     static const SYSTEMTIME time = { 2005, 1, 5, 7, 12, 6, 35, 0 };
@@ -430,7 +431,7 @@ static void InternetTimeFromSystemTimeA_
         "InternetTimeFromSystemTimeA failed (%ld)\n", GetLastError() );
 }
 
-static void InternetTimeFromSystemTimeW_test()
+static void InternetTimeFromSystemTimeW_test(void)
 {
     BOOL ret;
     static const SYSTEMTIME time = { 2005, 1, 5, 7, 12, 6, 35, 0 };
@@ -445,7 +446,7 @@ static void InternetTimeFromSystemTimeW_
         "InternetTimeFromSystemTimeW failed (%ld)\n", GetLastError() );
 }
 
-static void InternetTimeToSystemTimeA_test()
+static void InternetTimeToSystemTimeA_test(void)
 {
     BOOL ret;
     SYSTEMTIME time;
@@ -464,7 +465,7 @@ static void InternetTimeToSystemTimeA_te
         "InternetTimeToSystemTimeA failed (%ld)\n", GetLastError() );
 }
 
-static void InternetTimeToSystemTimeW_test()
+static void InternetTimeToSystemTimeW_test(void)
 {
     BOOL ret;
     SYSTEMTIME time;

More information about the wine-patches mailing list