Changeset 179703 in webkit

Timestamp:

Feb 5, 2015 1:46:11 PM (9 years ago)

Author:

Chris Dumez

Message:

Use deleteFile() in NetworkCacheStorageCocoa.mm
​https://bugs.webkit.org/show_bug.cgi?id=141299

Reviewed by Antti Koivisto.

Use deleteFile() in NetworkCacheStorageCocoa.mm to simplify the code
a bit.

• NetworkProcess/cache/NetworkCacheStorageCocoa.mm:

(WebKit::NetworkCacheStorage::removeEntry):
(WebKit::NetworkCacheStorage::clear):
(WebKit::NetworkCacheStorage::shrinkIfNeeded):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorageCocoa.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-05  Chris Dumez  <cdumez@apple.com>
+
+        Use deleteFile() in NetworkCacheStorageCocoa.mm
+        https://bugs.webkit.org/show_bug.cgi?id=141299
+
+        Reviewed by Antti Koivisto.
+
+        Use deleteFile() in NetworkCacheStorageCocoa.mm to simplify the code
+        a bit.
+
+        * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+        (WebKit::NetworkCacheStorage::removeEntry):
+        (WebKit::NetworkCacheStorage::clear):
+        (WebKit::NetworkCacheStorage::shrinkIfNeeded):
+
 2015-02-04  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm

@@ -346 +346 @@
     StringCapture filePathCapture(filePathForKey(key, m_directoryPath));
     dispatch_async(m_ioQueue.get(), [this, filePathCapture] {
-        CString path = WebCore::fileSystemRepresentation(filePathCapture.string());
-        unlink(path.data());
+        WebCore::deleteFile(filePathCapture.string());
         if (m_approximateEntryCount)
             --m_approximateEntryCount;
@@ -551 +550 @@
             String subdirPath = WebCore::pathByAppendingComponent(directoryPath, subdirName);
             traverseDirectory(subdirPath, DT_REG, [&subdirPath](const String& fileName) {
-                String filePath = WebCore::pathByAppendingComponent(subdirPath, fileName);
-                unlink(WebCore::fileSystemRepresentation(filePath).data());
+                WebCore::deleteFile(WebCore::pathByAppendingComponent(subdirPath, fileName));
             });
             rmdir(WebCore::fileSystemRepresentation(subdirPath).data());
@@ -579 +577 @@
         size_t foundEntryCount = 0;
         size_t deletedCount = 0;
-        traverseCacheFiles(cachePath, [this, &foundEntryCount, &deletedCount](const String& fileName, const String& directory) {
-            String partitionPath = WebCore::pathByAppendingComponent(directory, fileName);
-            CString path = WebCore::fileSystemRepresentation(partitionPath);
+        traverseCacheFiles(cachePath, [this, &foundEntryCount, &deletedCount](const String& fileName, const String& partitionPath) {
             ++foundEntryCount;
             if (foundEntryCount % everyNthResourceToDelete)
@@ -587 +583 @@
             ++deletedCount;
 
-            unlink(path.data());
+            WebCore::deleteFile(WebCore::pathByAppendingComponent(partitionPath, fileName));
 
             NetworkCacheKey::HashType hash;