Jacek Caban : wininet: Code clean up.
Alexandre Julliard
julliard at winehq.org
Fri Feb 15 05:35:56 CST 2008
Module: wine
Branch: master
Commit: f979134270565231acf3cba42fe75420f4678677
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f979134270565231acf3cba42fe75420f4678677
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Feb 13 13:34:05 2008 +0100
wininet: Code clean up.
---
dlls/wininet/http.c | 36 ++++++++++++------------------------
dlls/wininet/urlcache.c | 3 +--
2 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index d718eea..0245d2b 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -71,6 +71,7 @@ static const WCHAR szAuthorization[] = { 'A','u','t','h','o','r','i','z','a','t'
static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0 };
static const WCHAR szStatus[] = { 'S','t','a','t','u','s',0 };
static const WCHAR szKeepAlive[] = {'K','e','e','p','-','A','l','i','v','e',0};
+static const WCHAR szGET[] = { 'G','E','T', 0 };
#define MAXHOSTNAME 100
#define MAX_FIELD_VALUE_LEN 256
@@ -210,16 +211,6 @@ static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest)
HeapFree(GetProcessHeap(), 0, req->lpszHeader);
}
-static void HTTP_FixVerb( LPWININETHTTPREQW lpwhr )
-{
- /* if the verb is NULL default to GET */
- if (NULL == lpwhr->lpszVerb)
- {
- static const WCHAR szGET[] = { 'G','E','T', 0 };
- lpwhr->lpszVerb = WININET_strdupW(szGET);
- }
-}
-
static void HTTP_FixURL( LPWININETHTTPREQW lpwhr)
{
static const WCHAR szSlash[] = { '/',0 };
@@ -871,10 +862,9 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest,
dwBufferSize=sizeof(szNewLocation);
if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL))
{
- static const WCHAR szGET[] = { 'G','E','T', 0 };
/* redirects are always GETs */
HeapFree(GetProcessHeap(),0,lpwhr->lpszVerb);
- lpwhr->lpszVerb = WININET_strdupW(szGET);
+ lpwhr->lpszVerb = WININET_strdupW(szGET);
HTTP_DrainContent(lpwhr);
rc = HTTP_HandleRedirect(lpwhr, szNewLocation);
if (rc)
@@ -1379,7 +1369,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs,
goto lend;
}
- if (NULL != lpszObjectName && strlenW(lpszObjectName)) {
+ if (lpszObjectName && *lpszObjectName) {
HRESULT rc;
len = 0;
@@ -1396,7 +1386,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs,
}
}
- if (NULL != lpszReferrer && strlenW(lpszReferrer))
+ if (lpszReferrer && *lpszReferrer)
HTTP_ProcessHeader(lpwhr, HTTP_REFERER, lpszReferrer, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ);
if (lpszAcceptTypes)
@@ -1412,13 +1402,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs,
}
}
- if (NULL == lpszVerb)
- {
- static const WCHAR szGet[] = {'G','E','T',0};
- lpwhr->lpszVerb = WININET_strdupW(szGet);
- }
- else if (strlenW(lpszVerb))
- lpwhr->lpszVerb = WININET_strdupW(lpszVerb);
+ lpwhr->lpszVerb = WININET_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET);
HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ);
@@ -2394,6 +2378,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl)
HeapFree(GetProcessHeap(), 0, combined_url);
return FALSE;
}
+
HeapFree(GetProcessHeap(), 0, combined_url);
if (!strncmpW(szHttp, urlComponents.lpszScheme, strlenW(szHttp)) &&
@@ -2430,7 +2415,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl)
*/
/* consider the current host as the referrer */
- if (NULL != lpwhs->lpszServerName && strlenW(lpwhs->lpszServerName))
+ if (lpwhs->lpszServerName && *lpwhs->lpszServerName)
HTTP_ProcessHeader(lpwhr, HTTP_REFERER, lpwhs->lpszServerName,
HTTP_ADDHDR_FLAG_REQ|HTTP_ADDREQ_FLAG_REPLACE|
HTTP_ADDHDR_FLAG_ADD_IF_NEW);
@@ -2472,7 +2457,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl)
HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath);
lpwhr->lpszPath=NULL;
- if (strlenW(path))
+ if (*path)
{
DWORD needed = 0;
HRESULT rc;
@@ -2591,7 +2576,10 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
/* Clear any error information */
INTERNET_SetLastError(0);
- HTTP_FixVerb(lpwhr);
+ /* if the verb is NULL default to GET */
+ if (!lpwhr->lpszVerb)
+ lpwhr->lpszVerb = WININET_strdupW(szGET);
+
if (dwContentLength || !strcmpW(lpwhr->lpszVerb, szPost))
{
sprintfW(contentLengthStr, szContentLength, dwContentLength);
diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
index dc92aff..06dfd85 100644
--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -1974,8 +1974,7 @@ BOOL WINAPI CreateUrlCacheEntryW(
return FALSE;
}
- for (lpszUrlEnd = lpszUrlName; *lpszUrlEnd; lpszUrlEnd++)
- ;
+ lpszUrlEnd = lpszUrlName + strlenW(lpszUrlName);
if (((lpszUrlEnd - lpszUrlName) > 1) && (*(lpszUrlEnd - 1) == '/' || *(lpszUrlEnd - 1) == '\\'))
lpszUrlEnd--;
More information about the wine-cvs
mailing list