Fix some warnings.
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 3ed3f9d..af4605f 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c
@@ -1854,7 +1854,7 @@ * 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;
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1536dc0..d411be8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c
@@ -490,7 +490,7 @@ 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 @@ /*********************************************************************** * 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;
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0fe5ed2..2df69d5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c
@@ -102,9 +102,6 @@ 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 @@ { 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 };
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index dda81a4..aa4342a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h
@@ -469,6 +469,9 @@ 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 ? */
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bd84b9a..512e8ac 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c
@@ -19,7 +19,7 @@ int goon = 0; -VOID WINAPI callback( +static VOID WINAPI callback( HINTERNET hInternet, DWORD dwContext, DWORD dwInternetStatus, @@ -85,10 +85,11 @@ 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 @@ } } -void InternetOpenUrlA_test(void) +static void InternetOpenUrlA_test(void) { HINTERNET myhinternet, myhttp; char buffer[0x400]; @@ -261,7 +262,7 @@ 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 @@ 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 @@ 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 @@ "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 @@ "InternetTimeFromSystemTimeW failed (%ld)\n", GetLastError() ); } -static void InternetTimeToSystemTimeA_test() +static void InternetTimeToSystemTimeA_test(void) { BOOL ret; SYSTEMTIME time; @@ -464,7 +465,7 @@ "InternetTimeToSystemTimeA failed (%ld)\n", GetLastError() ); } -static void InternetTimeToSystemTimeW_test() +static void InternetTimeToSystemTimeW_test(void) { BOOL ret; SYSTEMTIME time;
diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 45443af..1908c26 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c
@@ -548,7 +548,7 @@ 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_DeleteAll() +void URLCacheContainers_DeleteAll(void) { while(!list_empty(&UrlContainers)) URLCacheContainer_DeleteContainer(