210225 2020-04-08 16:45:37 -0700 Add curly braces after one line if statement for the case when we aren't using the internal SDK 2020-04-08 17:20:20 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney ddkilzer jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1639358 0 katherine_cheney 2020-04-08 16:45:37 -0700 If there are no braces and WEBSITE_DATA_STORE_ADDITIONS is empty, this if-statement includes the following line, causing test failures. 1639359 1 webkit-bug-importer 2020-04-08 16:46:39 -0700 <rdar://problem/61485209> 1639361 2 395887 katherine_cheney 2020-04-08 16:48:16 -0700 Created attachment 395887 Patch 1639369 3 395887 ddkilzer 2020-04-08 16:57:11 -0700 Comment on attachment 395887 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395887&action=review r=me to fix tests, even though this is technically a style violation. > Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:430 > WEBSITE_DATA_STORE_ADDITIONS Eventually, the `WEBSITE_DATA_STORE_ADDITIONS` macro should probably have a do { ... } while(0) loop around its contents if it's multi-line, and maybe defined to `(void)0` if it is not set (in this file. Then the curly braces can be removed. 1639373 4 395887 ddkilzer 2020-04-08 17:00:25 -0700 Comment on attachment 395887 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395887&action=review >> Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:430 >> WEBSITE_DATA_STORE_ADDITIONS > > Eventually, the `WEBSITE_DATA_STORE_ADDITIONS` macro should probably have a do { ... } while(0) loop around its contents if it's multi-line, and maybe defined to `(void)0` if it is not set (in this file. Then the curly braces can be removed. Another way to fix this is: #ifndef WEBSITE_DATA_STORE_ADDITIONS #define WEBSITE_DATA_STORE_ADDITIONS (void)0 #endif At the top of the file. Then you can remove the curly brances and make the style bot happy. r=me either way you decide to fix. 1639382 5 ews-feeder 2020-04-08 17:20:19 -0700 Committed r259768: <https://trac.webkit.org/changeset/259768> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395887. 395887 2020-04-08 16:48:16 -0700 2020-04-08 17:20:19 -0700 Patch bug-210225-20200408164816.patch text/plain 1660 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ5ZjFhZWFiOWQxMTg3YmRk NGExOGVhNWU5OTgzMjEwMjRiN2FiNTcuLjA4NGEzZmRkNGQwZWY5NTE1MGY5MDA4Y2IzMzliMzBh ZWUwZDE3NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDQtMDggIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGN1cmx5IGJy YWNlcyBhZnRlciBvbmUgbGluZSBpZiBzdGF0ZW1lbnQgZm9yIHRoZSBjYXNlIHdoZW4gd2UgYXJl bid0IHVzaW5nIHRoZSBpbnRlcm5hbCBTREsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMDIyNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjE0ODUy MDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tOgorICAg ICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjppbml0aWFsaXplQXBwQm91bmREb21haW5z KToKKwogMjAyMC0wNC0wOCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNv bT4KIAogICAgICAgICBSZXR1cm4gYXBwLWJvdW5kIHNlc3Npb25zIGZvciBpbnN0YW5jZXMgd2hl cmUgV0tBcHBCb3VuZERvbWFpbnMgaXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5t bQppbmRleCA5YWI3ZDk3ZDg1ODNiNDdhNjYwZjExNGMyNjVmN2U2NzliNWExNDdiLi44N2NiOGI3 MDU0Mzk2ZDdlZjY2MWYwZjQ3ZTZmNThhZDhmNzY3YmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURh dGFTdG9yZUNvY29hLm1tCkBAIC00MjYsOCArNDI2LDkgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3Jl Ojppbml0aWFsaXplQXBwQm91bmREb21haW5zKEZvcmNlUmVpbml0aWFsaXphdGlvbiBmb3JjZVJl aW4KICAgICAgICAgICAgICAgICBpZiAoYXBwQm91bmREb21haW5zKCkuc2l6ZSgpID49IG1heEFw cEJvdW5kRG9tYWluQ291bnQpCiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg ICAgfQotICAgICAgICAgICAgaWYgKGlzSW5BcHBCcm93c2VyUHJpdmFjeUVuYWJsZWQpCisgICAg ICAgICAgICBpZiAoaXNJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZCkgewogICAgICAgICAgICAg ICAgIFdFQlNJVEVfREFUQV9TVE9SRV9BRERJVElPTlMKKyAgICAgICAgICAgIH0KICAgICAgICAg ICAgIGhhc0luaXRpYWxpemVkQXBwQm91bmREb21haW5zID0gdHJ1ZTsKICAgICAgICAgfSk7CiAg ICAgfSk7Cg==