31323 2009-11-10 15:38:13 -0800 Fix a few compiler warnings 2009-11-11 06:45:52 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Linux RESOLVED FIXED P3 Normal --- 1 laszlo.gombos webkit-unassigned commit-queue oldest_to_newest 162256 0 laszlo.gombos 2009-11-10 15:38:13 -0800 QtWebKit built on Linux using GCC 4.4 reports the following compiler warnings: WebCore/editing/htmlediting.cpp: In function bool WebCore::isRenderedAsNonInlineTableImageOrHR(const WebCore::Node*): WebCore/editing/htmlediting.cpp:1087: warning: suggest parentheses around && within || WebKit/qt/tests/qwebframe/tst_qwebframe.cpp: In member function virtual QNetworkReply* FakeNetworkManager::createRequest(QNetworkAccessManager::Operation, const QNetworkRequest&, QIODevice*): WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2241: warning: suggest explicit braces to avoid ambiguous else 162269 1 42905 laszlo.gombos 2009-11-10 16:02:44 -0800 Created attachment 42905 proposed patch 162465 2 42905 commit-queue 2009-11-11 06:45:47 -0800 Comment on attachment 42905 proposed patch Clearing flags on attachment: 42905 Committed r50806: <http://trac.webkit.org/changeset/50806> 162466 3 commit-queue 2009-11-11 06:45:52 -0800 All reviewed patches have been landed. Closing bug. 42905 2009-11-10 16:02:44 -0800 2009-11-11 06:45:46 -0800 proposed patch 31323.patch text/plain 2935 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDc3OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMTEtMTAgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTMyMworICAg ICAgICBGaXggYSBmZXcgY29tcGlsZXIgd2FybmluZ3MKKworICAgICAgICBObyBuZXcgdGVzdHMg YXMgdGhlcmUgaXMgbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBlZGl0aW5nL2h0 bWxlZGl0aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzUmVuZGVyZWRBc05vbklubGluZVRh YmxlSW1hZ2VPckhSKTogVXNlIGV4cGxpY2l0CisgICAgICAgIHBhcmVudGhlc2VzIHRvIHNpbGVu Y2UgZ2NjIDQuNCAtV3BhcmVudGhlc2VzIHdhcm5pbmdzCisKIDIwMDktMTEtMTAgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWlu aWcuCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5jcHAJKHJldmlzaW9uIDUwNjEzKQorKysgV2Vi Q29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA4NCw3ICsx MDg0LDcgQEAgYm9vbCBpc1JlbmRlcmVkQXNOb25JbmxpbmVUYWJsZUltYWdlT3JIUgogICAgIGlm ICghbm9kZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIFJlbmRlck9iamVjdCogcmVuZGVy ZXIgPSBub2RlLT5yZW5kZXJlcigpOwotICAgIHJldHVybiByZW5kZXJlciAmJiAoKHJlbmRlcmVy LT5pc1RhYmxlKCkgJiYgIXJlbmRlcmVyLT5pc0lubGluZSgpKSB8fCByZW5kZXJlci0+aXNJbWFn ZSgpICYmICFyZW5kZXJlci0+aXNJbmxpbmUoKSB8fCByZW5kZXJlci0+aXNIUigpKTsKKyAgICBy ZXR1cm4gcmVuZGVyZXIgJiYgKChyZW5kZXJlci0+aXNUYWJsZSgpICYmICFyZW5kZXJlci0+aXNJ bmxpbmUoKSkgfHwgKHJlbmRlcmVyLT5pc0ltYWdlKCkgJiYgIXJlbmRlcmVyLT5pc0lubGluZSgp KSB8fCByZW5kZXJlci0+aXNIUigpKTsKIH0KIAogUGFzc1JlZlB0cjxSYW5nZT4gYXZvaWRJbnRl cnNlY3Rpb25XaXRoTm9kZShjb25zdCBSYW5nZSogcmFuZ2UsIE5vZGUqIG5vZGUpCkluZGV4OiBX ZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHJl dmlzaW9uIDUwNzc4KQorKysgV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDEzIEBACisyMDA5LTExLTEwICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9z QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzEzMjMKKyAgICAg ICAgRml4IGEgZmV3IGNvbXBpbGVyIHdhcm5pbmdzCisKKyAgICAgICAgKiB0ZXN0cy9xd2ViZnJh bWUvdHN0X3F3ZWJmcmFtZS5jcHA6IEFkZCBleHRyYSBicmFja2V0cyAKKyAgICAgICAgdG8gbWFr ZSBpdCBleHBsaWNpdCB3aGVyZSB0aGUgZWxzZSBjYXNlIGJlbG9uZ3MKKwogMjAwOS0xMS0xMCAg S2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZCBkb2N1bWVudGF0aW9uIGZpeGVzLgpJbmRleDogV2ViS2l0L3F0L3Rlc3Rz L3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvdGVz dHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCShyZXZpc2lvbiA1MDYxMykKKysrIFdlYktp dC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIyMzgsNyArMjIzOCw3IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIFFOZXR3b3JrUmVwbHkq IGNyZWF0ZVJlcXVlc3QoT3BlcmF0aW9uIG9wLCBjb25zdCBRTmV0d29ya1JlcXVlc3QmIHJlcXVl c3QsIFFJT0RldmljZSogb3V0Z29pbmdEYXRhKQogICAgIHsKICAgICAgICAgUVN0cmluZyB1cmwg PSByZXF1ZXN0LnVybCgpLnRvU3RyaW5nKCk7Ci0gICAgICAgIGlmIChvcCA9PSBRTmV0d29ya0Fj Y2Vzc01hbmFnZXI6OkdldE9wZXJhdGlvbikKKyAgICAgICAgaWYgKG9wID09IFFOZXR3b3JrQWNj ZXNzTWFuYWdlcjo6R2V0T3BlcmF0aW9uKSB7CiAgICAgICAgICAgICBpZiAodXJsID09ICJxcmM6 L3Rlc3QxLmh0bWwiIHx8ICB1cmwgPT0gImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIpCiAgICAgICAg ICAgICAgICAgcmV0dXJuIG5ldyBGYWtlUmVwbHkocmVxdWVzdCwgdGhpcyk7CiAjaWZuZGVmIFFU X05PX09QRU5TU0wKQEAgLTIyNDksNiArMjI0OSw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgICAg ICAgICByZXR1cm4gcmVwbHk7CiAgICAgICAgICAgICB9CiAjZW5kaWYKKyAgICAgICB9CiAKICAg ICAgICAgcmV0dXJuIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6Y3JlYXRlUmVxdWVzdChvcCwgcmVx dWVzdCwgb3V0Z29pbmdEYXRhKTsKICAgICB9Cg==