149867 2015-10-06 20:17:22 -0700 Format string issues in NetworkCache.cpp 2015-10-08 08:30:22 -0700 1 1 1 Unclassified WebKit WebKit Misc. Other PC Linux RESOLVED FIXED P2 Minor --- 1 mcatanzaro mcatanzaro cgarcia commit-queue mcatanzaro ossy oldest_to_newest 1131212 0 mcatanzaro 2015-10-06 20:17:22 -0700 [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); ^ 1131224 1 262578 mcatanzaro 2015-10-06 21:29:41 -0700 Created attachment 262578 Patch 1131636 2 262578 commit-queue 2015-10-08 08:30:19 -0700 Comment on attachment 262578 Patch Clearing flags on attachment: 262578 Committed r190726: <http://trac.webkit.org/changeset/190726> 1131637 3 commit-queue 2015-10-08 08:30:22 -0700 All reviewed patches have been landed. Closing bug. 262578 2015-10-06 21:29:41 -0700 2015-10-08 08:30:19 -0700 Patch bug-149867-20151006232910.patch text/plain 3029 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwNjYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWE1M2FlYzcxYjFkMTE3 MzQ2NWRmOWIwZjBlNzZiNjY1YWU1MjM0OC4uZDFkODViNGQ3YzRmYjQyOGQxMzgyNmM4MTVlNTZh OWY4ODhkODM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE1LTEwLTA2ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAorICAgICAgICBGb3JtYXQg c3RyaW5nIGlzc3VlcyBpbiBOZXR3b3JrQ2FjaGUuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDk4NjcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYXN0IGVudW1zIHRvIGludHMgYmVmb3JlIHByaW50 aW5nIHRoZW0gdG8gcGxhY2F0ZSBHQ0MncyAtV2Zvcm1hdC4KKworICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtD YWNoZTo6Q2FjaGU6OnJldHJpZXZlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpD YWNoZTo6c3RvcmUpOgorCisyMDE1LTEwLTA2ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnph cm9AaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBBZGQgYXV0b2NsZWFudXBzCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDk1ODgKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNw cCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAK aW5kZXggODBkNDk4MTk3MTUwNmM5Mzg0NGYyNjUxZjYyNmMxNmMxYzNkOTdlZi4uYWY4NzQ5MzU1 NTFkYWQ1NDY2MDEwZmVhMmE2OTNlMzVmOTNlODNhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCkBAIC0zMzQsNyArMzM0 LDcgQEAgdm9pZCBDYWNoZTo6cmV0cmlldmUoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiBvcmlnaW5hbFJlcXVlc3QsIHVpbnQ2NF90IHcKICAgICBBU1NFUlQoaXNFbmFibGVkKCkpOwog ICAgIEFTU0VSVChvcmlnaW5hbFJlcXVlc3QudXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgp KTsKIAotICAgIExPRyhOZXR3b3JrQ2FjaGUsICIoTmV0d29ya1Byb2Nlc3MpIHJldHJpZXZpbmcg JXMgcHJpb3JpdHkgJXUiLCBvcmlnaW5hbFJlcXVlc3QudXJsKCkuc3RyaW5nKCkuYXNjaWkoKS5k YXRhKCksIG9yaWdpbmFsUmVxdWVzdC5wcmlvcml0eSgpKTsKKyAgICBMT0coTmV0d29ya0NhY2hl LCAiKE5ldHdvcmtQcm9jZXNzKSByZXRyaWV2aW5nICVzIHByaW9yaXR5ICVkIiwgb3JpZ2luYWxS ZXF1ZXN0LnVybCgpLnN0cmluZygpLmFzY2lpKCkuZGF0YSgpLCBzdGF0aWNfY2FzdDxpbnQ+KG9y aWdpbmFsUmVxdWVzdC5wcmlvcml0eSgpKSk7CiAKICAgICBpZiAobV9zdGF0aXN0aWNzKQogICAg ICAgICBtX3N0YXRpc3RpY3MtPnJlY29yZFJldHJpZXZhbFJlcXVlc3Qod2ViUGFnZUlEKTsKQEAg LTM4MCw3ICszODAsNyBAQCB2b2lkIENhY2hlOjpyZXRyaWV2ZShjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgdWludDY0X3QgdwogCiAjaWYgIUxPR19ESVNB QkxFRAogICAgICAgICBhdXRvIGVsYXBzZWRNUyA9IHN0YXRpY19jYXN0PGludDY0X3Q+KHN0ZDo6 Y2hyb25vOjpkdXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM+KHN0ZDo6Y2hy b25vOjpzeXN0ZW1fY2xvY2s6Om5vdygpIC0gc3RhcnRUaW1lKS5jb3VudCgpKTsKLSAgICAgICAg TE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2VzcykgcmV0cmlldmUgY29tcGxldGUgdXNl RGVjaXNpb249JWQgcHJpb3JpdHk9JXUgdGltZT0lIiBQUklpNjQgIm1zIiwgdXNlRGVjaXNpb24s IG9yaWdpbmFsUmVxdWVzdC5wcmlvcml0eSgpLCBlbGFwc2VkTVMpOworICAgICAgICBMT0coTmV0 d29ya0NhY2hlLCAiKE5ldHdvcmtQcm9jZXNzKSByZXRyaWV2ZSBjb21wbGV0ZSB1c2VEZWNpc2lv bj0lZCBwcmlvcml0eT0lZCB0aW1lPSUiIFBSSWk2NCAibXMiLCBzdGF0aWNfY2FzdDxpbnQ+KHVz ZURlY2lzaW9uKSwgc3RhdGljX2Nhc3Q8aW50PihvcmlnaW5hbFJlcXVlc3QucHJpb3JpdHkoKSks IGVsYXBzZWRNUyk7CiAjZW5kaWYKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGOjptb3Zl KGVudHJ5KSk7CiAKQEAgLTQwNiw3ICs0MDYsNyBAQCB2b2lkIENhY2hlOjpzdG9yZShjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgY29uc3QgV2ViQ29yZQog CiAgICAgU3RvcmVEZWNpc2lvbiBzdG9yZURlY2lzaW9uID0gbWFrZVN0b3JlRGVjaXNpb24ob3Jp Z2luYWxSZXF1ZXN0LCByZXNwb25zZSk7CiAgICAgaWYgKHN0b3JlRGVjaXNpb24gIT0gU3RvcmVE ZWNpc2lvbjo6WWVzKSB7Ci0gICAgICAgIExPRyhOZXR3b3JrQ2FjaGUsICIoTmV0d29ya1Byb2Nl c3MpIGRpZG4ndCBzdG9yZSwgc3RvcmVEZWNpc2lvbj0lZCIsIHN0b3JlRGVjaXNpb24pOworICAg ICAgICBMT0coTmV0d29ya0NhY2hlLCAiKE5ldHdvcmtQcm9jZXNzKSBkaWRuJ3Qgc3RvcmUsIHN0 b3JlRGVjaXNpb249JWQiLCBzdGF0aWNfY2FzdDxpbnQ+KHN0b3JlRGVjaXNpb24pKTsKICAgICAg ICAgYXV0byBrZXkgPSBtYWtlQ2FjaGVLZXkob3JpZ2luYWxSZXF1ZXN0KTsKIAogICAgICAgICBh dXRvIGlzU3VjY2Vzc2Z1bFJldmFsaWRhdGlvbiA9IHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkg PT0gMzA0Owo=