Format string issues in NetworkCache.cpp

[Michael Catanzaro]

[1045/1606] Building CXX object Source...etworkProcess/cache/NetworkCache.cpp.o
In file included from ../../Source/WTF/wtf/StdLibExtras.h:32:0,
                 from ../../Source/WTF/wtf/FastMalloc.h:26,
                 from ../../Source/WebKit2/config.h:44,
                 from ../../Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp:26:
../../Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp: In member function ‘void WebKit::NetworkCache::Cache::retrieve(const WebCore::ResourceRequest&, uint64_t, std::function<void(std::unique_ptr<WebKit::NetworkCache::Entry>)>)’:
../../Source/WTF/wtf/Assertions.h:349:105: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘WebCore::ResourceLoadPriority’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
                                                                                                         ^
../../Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp:337:5: note: in expansion of macro ‘LOG’
     LOG(NetworkCache, "(NetworkProcess) retrieving %s priority %u", originalRequest.url().string().ascii().data(), originalRequest.priority());
     ^
../../Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp: In lambda function:
../../Source/WTF/wtf/Assertions.h:349:105: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘WebKit::NetworkCache::UseDecision’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
                                                                                                         ^
../../Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp:383:9: note: in expansion of macro ‘LOG’
         LOG(NetworkCache, "(NetworkProcess) retrieve complete useDecision=%d priority=%u time=%" PRIi64 "ms", useDecision, originalRequest.priority(), elapsedMS);
         ^
../../Source/WTF/wtf/Assertions.h:349:105: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘WebCore::ResourceLoadPriority’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
                                                                                                         ^
../../Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp:383:9: note: in expansion of macro ‘LOG’
         LOG(NetworkCache, "(NetworkProcess) retrieve complete useDecision=%d priority=%u time=%" PRIi64 "ms", useDecision, originalRequest.priority(), elapsedMS);
         ^
../../Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp: In member function ‘void WebKit::NetworkCache::Cache::store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, WTF::RefPtr<WebCore::SharedBuffer>&&, std::function<void(WebKit::NetworkCache::MappedBody&)>)’:
../../Source/WTF/wtf/Assertions.h:349:105: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘WebKit::NetworkCache::StoreDecision’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
                                                                                                         ^
../../Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp:409:9: note: in expansion of macro ‘LOG’
         LOG(NetworkCache, "(NetworkProcess) didn't store, storeDecision=%d", storeDecision);
         ^

[Michael Catanzaro]

Created attachment 262578 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 262578 [details]
Patch

Clearing flags on attachment: 262578

Committed r190726: <http://trac.webkit.org/changeset/190726>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.