[webkit-changes] [190726] trunk/Source/WebKit2

Thu, 08 Oct 2015 08:30:01 -0700

Title: [190726] trunk/Source/WebKit2
Revision
190726
Author
[email protected]
Date
2015-10-08 08:29:47 -0700 (Thu, 08 Oct 2015)

Log Message

Format string issues in NetworkCache.cpp
https://bugs.webkit.org/show_bug.cgi?id=149867

Reviewed by Csaba Osztrogonác.

Cast enums to ints before printing them to placate GCC's -Wformat.

* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::retrieve):
(WebKit::NetworkCache::Cache::store):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (190725 => 190726)


--- trunk/Source/WebKit2/ChangeLog	2015-10-08 15:27:36 UTC (rev 190725)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-08 15:29:47 UTC (rev 190726)
@@ -1,5 +1,18 @@
 2015-10-08  Michael Catanzaro  <[email protected]>
 
+        Format string issues in NetworkCache.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=149867
+
+        Reviewed by Csaba Osztrogonác.
+
+        Cast enums to ints before printing them to placate GCC's -Wformat.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::Cache::retrieve):
+        (WebKit::NetworkCache::Cache::store):
+
+2015-10-08  Michael Catanzaro  <[email protected]>
+
         Format string issue in WebResourceLoadScheduler.cpp
         https://bugs.webkit.org/show_bug.cgi?id=149868

Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (190725 => 190726)


--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp	2015-10-08 15:27:36 UTC (rev 190725)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp	2015-10-08 15:29:47 UTC (rev 190726)
@@ -334,7 +334,7 @@
     ASSERT(isEnabled());
     ASSERT(originalRequest.url().protocolIsInHTTPFamily());
 
-    LOG(NetworkCache, "(NetworkProcess) retrieving %s priority %u", originalRequest.url().string().ascii().data(), originalRequest.priority());
+    LOG(NetworkCache, "(NetworkProcess) retrieving %s priority %d", originalRequest.url().string().ascii().data(), static_cast<int>(originalRequest.priority()));
 
     if (m_statistics)
         m_statistics->recordRetrievalRequest(webPageID);
@@ -380,7 +380,7 @@
 
 #if !LOG_DISABLED
         auto elapsedMS = static_cast<int64_t>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count());
-        LOG(NetworkCache, "(NetworkProcess) retrieve complete useDecision=%d priority=%u time=%" PRIi64 "ms", useDecision, originalRequest.priority(), elapsedMS);
+        LOG(NetworkCache, "(NetworkProcess) retrieve complete useDecision=%d priority=%d time=%" PRIi64 "ms", static_cast<int>(useDecision), static_cast<int>(originalRequest.priority()), elapsedMS);
 #endif
         completionHandler(WTF::move(entry));
 
@@ -406,7 +406,7 @@
 
     StoreDecision storeDecision = makeStoreDecision(originalRequest, response);
     if (storeDecision != StoreDecision::Yes) {
-        LOG(NetworkCache, "(NetworkProcess) didn't store, storeDecision=%d", storeDecision);
+        LOG(NetworkCache, "(NetworkProcess) didn't store, storeDecision=%d", static_cast<int>(storeDecision));
         auto key = makeCacheKey(originalRequest);
 
         auto isSuccessfulRevalidation = response.httpStatusCode() == 304;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to