Fix after recent urlcache changes

Gerald Pfeifer gerald at pfeifer.com
Sun Dec 28 08:00:24 CST 2003


After the following change to dlls/wininet/urlcache.c

  revision 1.14
  date: 2003/12/12 06:01:20;  author: julliard;  state: Exp;  lines: +976 -418
  Robert Shearman <R.J.Shearman at warwick.ac.uk>
  - Url Cache improvements.
  - In Internet{Set,Query}Option functions, hInternet can be NULL.
  - Add traces to Internet* functions.

I started getting the following compiler warning
  urlcache.c:556: warning: `URLCache_FindEntry' defined but not used
as URLCache_FindEntry() is a static (file local) function, but not used
anywhere any longer.

The patch below fixes this.

Gerald

ChangeLog:
Remove URLCache_FindEntry() which is not used any longer.
Index: urlcache.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/urlcache.c,v
retrieving revision 1.14
diff -u -3 -p -r1.14 urlcache.c
--- urlcache.c	12 Dec 2003 06:01:20 -0000	1.14
+++ urlcache.c	28 Dec 2003 13:30:22 -0000
@@ -543,62 +543,6 @@ static inline void URLCache_Allocation_B
 }

 /***********************************************************************
- *           URLCache_FindEntry (Internal)
- *
- *  Finds an entry without using the hash tables
- *
- * RETURNS
- *    TRUE if it found the specified entry
- *    FALSE otherwise
- *
- */
-static BOOL URLCache_FindEntry(LPCURLCACHE_HEADER pHeader, LPCSTR szUrl, CACHEFILE_ENTRY ** ppEntry)
-{
-    CACHEFILE_ENTRY * pCurrentEntry;
-    DWORD dwBlockNumber;
-
-    BYTE * AllocationTable = (LPBYTE)pHeader + ALLOCATION_TABLE_OFFSET;
-
-    for (pCurrentEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + ENTRY_START_OFFSET);
-         (DWORD)((LPBYTE)pCurrentEntry - (LPBYTE)pHeader) < pHeader->dwFileSize;
-         pCurrentEntry = (CACHEFILE_ENTRY *)((LPBYTE)pCurrentEntry + pCurrentEntry->dwBlocksUsed * BLOCKSIZE))
-    {
-        dwBlockNumber = (DWORD)((LPBYTE)pCurrentEntry - (LPBYTE)pHeader - ENTRY_START_OFFSET) / BLOCKSIZE;
-        while (URLCache_Allocation_BlockIsFree(AllocationTable, dwBlockNumber))
-        {
-            if (dwBlockNumber >= pHeader->dwIndexCapacityInBlocks)
-                return FALSE;
-
-            pCurrentEntry = (CACHEFILE_ENTRY *)((LPBYTE)pCurrentEntry + BLOCKSIZE);
-            dwBlockNumber = (DWORD)((LPBYTE)pCurrentEntry - (LPBYTE)pHeader - ENTRY_START_OFFSET) / BLOCKSIZE;
-        }
-
-        switch (pCurrentEntry->dwSignature)
-        {
-        case URL_SIGNATURE: /* "URL " */
-        case LEAK_SIGNATURE: /* "LEAK" */
-            {
-                URL_CACHEFILE_ENTRY * pUrlEntry = (URL_CACHEFILE_ENTRY *)pCurrentEntry;
-                if (!strcmp(szUrl, pUrlEntry->szSourceUrlName))
-                {
-                    *ppEntry = pCurrentEntry;
-                    /* FIXME: should we update the LastAccessTime here? */
-                    return TRUE;
-                }
-            }
-            break;
-        case HASH_SIGNATURE: /* HASH entries parsed in FindEntryInHash */
-        case 0xDEADBEEF: /* this is always at offset 0x4000 in URL cache for some reason */
-            break;
-        default:
-            FIXME("Unknown entry %.4s ignored\n", (LPCSTR)&pCurrentEntry->dwSignature);
-        }
-
-    }
-    return FALSE;
-}
-
-/***********************************************************************
  *           URLCache_FindFirstFreeEntry (Internal)
  *
  *  Finds and allocates the first block of free space big enough and



More information about the wine-patches mailing list