Juan Lang : wininet: Pass hash entry directly to URLCache_DeleteEntryFromHash.
Alexandre Julliard
julliard at winehq.org
Tue Oct 23 13:14:32 CDT 2007
Module: wine
Branch: master
Commit: 1b42c00789682b67e95a0b91643de0c45ac344ef
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b42c00789682b67e95a0b91643de0c45ac344ef
Author: Juan Lang <juan.lang at gmail.com>
Date: Mon Oct 22 10:16:50 2007 -0700
wininet: Pass hash entry directly to URLCache_DeleteEntryFromHash.
---
dlls/wininet/urlcache.c | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
index e895cd7..09369c0 100644
--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -1210,16 +1210,11 @@ static BOOL URLCache_HashEntrySetUse(struct _HASH_ENTRY * pHashEntry, DWORD dwUs
* FALSE if the entry could not be found
*
*/
-static BOOL URLCache_DeleteEntryFromHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl)
+static BOOL URLCache_DeleteEntryFromHash(struct _HASH_ENTRY * pHashEntry)
{
- struct _HASH_ENTRY * pHashEntry;
- if (URLCache_FindHash(pHeader, lpszUrl, &pHashEntry))
- {
- pHashEntry->dwHashKey = HASHTABLE_FREE;
- pHashEntry->dwOffsetEntry = HASHTABLE_FREE;
- return TRUE;
- }
- return FALSE;
+ pHashEntry->dwHashKey = HASHTABLE_FREE;
+ pHashEntry->dwOffsetEntry = HASHTABLE_FREE;
+ return TRUE;
}
/***********************************************************************
@@ -2597,7 +2592,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName)
pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry);
URLCache_DeleteEntry(pHeader, pEntry);
- URLCache_DeleteEntryFromHash(pHeader, lpszUrlName);
+ URLCache_DeleteEntryFromHash(pHashEntry);
URLCacheContainer_UnlockIndex(pContainer, pHeader);
@@ -2656,7 +2651,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName)
pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry);
URLCache_DeleteEntry(pHeader, pEntry);
- URLCache_DeleteEntryFromHash(pHeader, urlA);
+ URLCache_DeleteEntryFromHash(pHashEntry);
URLCacheContainer_UnlockIndex(pContainer, pHeader);
More information about the wine-cvs
mailing list