140003 2014-12-29 19:24:26 -0800 [Cocoa] Enable the compiler to check format strings specified with UI_STRING and UI_STRING_KEY 2014-12-30 12:43:12 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz commit-queue darin oldest_to_newest 1058158 0 mitz 2014-12-29 19:24:26 -0800 Enable the compiler to emit a warning for something like [NSString stringWithFormat:UI_STRING("%d files", "label next to file upload button"), @"not an int"] based on %d not matching the NSString parameter. 1058160 1 243817 mitz 2014-12-29 19:34:59 -0800 Created attachment 243817 Add format_arg attributes to UI_STRING and UI_STRING_KEY 1058161 2 commit-queue 2014-12-29 19:36:13 -0800 Attachment 243817 did not pass style-queue: ERROR: Source/WebKit/mac/Misc/WebLocalizableStrings.h:47: The parameter name "bundle" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/WebKit/mac/Misc/WebLocalizableStrings.h:54: The parameter name "bundle" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1058190 3 243817 darin 2014-12-30 10:05:54 -0800 Comment on attachment 243817 Add format_arg attributes to UI_STRING and UI_STRING_KEY View in context: https://bugs.webkit.org/attachment.cgi?id=243817&action=review > Source/WebKit/mac/ChangeLog:9 > + that takes their "string" parameter as a "value" "parameter and has an attribute telling Extra quote here? 1058191 4 243817 darin 2014-12-30 10:09:07 -0800 Comment on attachment 243817 Add format_arg attributes to UI_STRING and UI_STRING_KEY View in context: https://bugs.webkit.org/attachment.cgi?id=243817&action=review > Source/WebKit/mac/Misc/WebLocalizableStrings.h:52 > +static inline NS_FORMAT_ARGUMENT(3) NSString *WebLocalizedStringWithValue(WebLocalizableStringsBundle *bundle, const char* key, const char* value) > +{ > + return WebLocalizedString(bundle, key); > +} On reflection, I don’t think it’s good for WebLocalizedStringWithValue inlines to be inside extern "C"; I also don’t like the formatting with the #if right up against the functions, but blank lines between the two functions. I’d move WebLocalizedStringWithValue down below. And I’d even consider using a macro for the NS/CF_FORMAT_ARGUMENT so we don’t have to repeat the WebLocalizedStringWithValue function twice. 1058192 5 mitz 2014-12-30 10:13:09 -0800 (In reply to comment #4) > Comment on attachment 243817 [details] > Add format_arg attributes to UI_STRING and UI_STRING_KEY > > View in context: > https://bugs.webkit.org/attachment.cgi?id=243817&action=review > > > Source/WebKit/mac/Misc/WebLocalizableStrings.h:52 > > +static inline NS_FORMAT_ARGUMENT(3) NSString *WebLocalizedStringWithValue(WebLocalizableStringsBundle *bundle, const char* key, const char* value) > > +{ > > + return WebLocalizedString(bundle, key); > > +} > > On reflection, I don’t think it’s good for WebLocalizedStringWithValue > inlines to be inside extern "C"; I also don’t like the formatting with the > #if right up against the functions, but blank lines between the two > functions. I’d move WebLocalizedStringWithValue down below. OK. > And I’d even > consider using a macro for the NS/CF_FORMAT_ARGUMENT so we don’t have to > repeat the WebLocalizedStringWithValue function twice. Wouldn’t we still need to repeat at least the function signature because of the return types being different? 1058193 6 darin 2014-12-30 10:21:07 -0800 (In reply to comment #5) > > And I’d even > > consider using a macro for the NS/CF_FORMAT_ARGUMENT so we don’t have to > > repeat the WebLocalizedStringWithValue function twice. > > Wouldn’t we still need to repeat at least the function signature because of > the return types being different? Might need a typedef too, yes. 1058199 7 mitz 2014-12-30 12:43:12 -0800 Committed <http://trac.webkit.org/r177825>. 243817 2014-12-29 19:34:59 -0800 2014-12-30 10:05:54 -0800 Add format_arg attributes to UI_STRING and UI_STRING_KEY bug-140003-20141229193501.patch text/plain 3208 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzgyMCkKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTI5 ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBFbmFi bGUgdGhlIGNvbXBpbGVyIHRvIGNoZWNrIGZvcm1hdCBzdHJpbmdzIHNwZWNpZmllZCB3aXRoIFVJ X1NUUklORyBhbmQgVUlfU1RSSU5HX0tFWQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQwMDAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBNaXNjL1dlYkxvY2FsaXphYmxlU3RyaW5ncy5oOiBNYWRlIFVJ X1NUUklORyBhbmQgVUlfU1RSSU5HX0tFWSBjYWxsIGEgbmV3IGhlbHBlciBmdW5jdGlvbgorICAg ICAgICB0aGF0IHRha2VzIHRoZWlyICJzdHJpbmciIHBhcmFtZXRlciBhcyBhICJ2YWx1ZSIgInBh cmFtZXRlciBhbmQgaGFzIGFuIGF0dHJpYnV0ZSB0ZWxsaW5nCisgICAgICAgIHRoZSBjb21waWxl ciB0aGF0IGlmIHRoZSAidmFsdWUiIHBhcmFtZXRlciBpcyBhIGZvcm1hdCBzdHJpbmcgdGhlbiB0 aGUgZnVuY3Rpb24gcmV0dXJucyBhCisgICAgICAgIG1vZGlmaWVkIHZlcnNpb24gb2YgaXQuIFRo ZSByZXN1bHQgaXMgdGhhdCBpZiBVSV9TVFJJTkcgaXMgdXNlZCBhcyBhIGZvcm1hdCBzdHJpbmcg cGFyYW1ldGVyCisgICAgICAgIHRvIHNvbWUgZnVuY3Rpb24gb3IgbWV0aG9kLCB0aGUgY29tcGls ZXIgd2lsbCBjaGVjayB0aGUgZm9ybWF0IHNwZWNpZmllcnMgaW4gdGhlIHN0cmluZworICAgICAg ICBhZ2FpbnN0IHRoZSBvdGhlciBwYXJhbWV0ZXJzLgorCiAyMDE0LTEyLTI5ICBEYW4gQmVybnN0 ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgRml4ZWQgdGhlIGlPUyBidWlsZC4KSW5k ZXg6IFNvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViTG9jYWxpemFibGVTdHJpbmdzLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJMb2NhbGl6YWJsZVN0cmluZ3MuaAko cmV2aXNpb24gMTc3ODE3KQorKysgU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJMb2NhbGl6YWJs ZVN0cmluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsOSArNDQsMTkgQEAgZXh0ZXJuICJDIiB7 CiAjZW5kaWYKIAogI2lmIF9fT0JKQ19fCi1OU1N0cmluZyAqV2ViTG9jYWxpemVkU3RyaW5nKFdl YkxvY2FsaXphYmxlU3RyaW5nc0J1bmRsZSAqYnVuZGxlLCBjb25zdCBjaGFyICprZXkpOworTlNT dHJpbmcgKldlYkxvY2FsaXplZFN0cmluZyhXZWJMb2NhbGl6YWJsZVN0cmluZ3NCdW5kbGUgKmJ1 bmRsZSwgY29uc3QgY2hhcioga2V5KTsKKworc3RhdGljIGlubGluZSBOU19GT1JNQVRfQVJHVU1F TlQoMykgTlNTdHJpbmcgKldlYkxvY2FsaXplZFN0cmluZ1dpdGhWYWx1ZShXZWJMb2NhbGl6YWJs ZVN0cmluZ3NCdW5kbGUgKmJ1bmRsZSwgY29uc3QgY2hhcioga2V5LCBjb25zdCBjaGFyKiB2YWx1 ZSkKK3sKKyAgICByZXR1cm4gV2ViTG9jYWxpemVkU3RyaW5nKGJ1bmRsZSwga2V5KTsKK30KICNl bHNlCi1DRlN0cmluZ1JlZiBXZWJMb2NhbGl6ZWRTdHJpbmcoV2ViTG9jYWxpemFibGVTdHJpbmdz QnVuZGxlICpidW5kbGUsIGNvbnN0IGNoYXIgKmtleSk7CitDRlN0cmluZ1JlZiBXZWJMb2NhbGl6 ZWRTdHJpbmcoV2ViTG9jYWxpemFibGVTdHJpbmdzQnVuZGxlICpidW5kbGUsIGNvbnN0IGNoYXIq IGtleSk7CisKK3N0YXRpYyBpbmxpbmUgQ0ZfRk9STUFUX0FSR1VNRU5UKDMpIENGU3RyaW5nUmVm IFdlYkxvY2FsaXplZFN0cmluZ1dpdGhWYWx1ZShXZWJMb2NhbGl6YWJsZVN0cmluZ3NCdW5kbGUg KmJ1bmRsZSwgY29uc3QgY2hhcioga2V5LCBjb25zdCBjaGFyKiB2YWx1ZSkKK3sKKyAgICByZXR1 cm4gV2ViTG9jYWxpemVkU3RyaW5nKGJ1bmRsZSwga2V5KTsKK30KICNlbmRpZgogCiAjaWYgVEFS R0VUX09TX0lQSE9ORQpAQCAtNjMsMTIgKzczLDEyIEBAIHZvaWQgTG9hZFdlYkxvY2FsaXplZFN0 cmluZ3Modm9pZCk7IC8vIFQKICNkZWZpbmUgTE9DQUxJWkFCTEVfU1RSSU5HU19CVU5ETEVfSEVM UEVSKEYpIEYgIyMgTG9jYWxpemFibGVTdHJpbmdzQnVuZGxlCiBleHRlcm4gV2ViTG9jYWxpemFi bGVTdHJpbmdzQnVuZGxlIExPQ0FMSVpBQkxFX1NUUklOR1NfQlVORExFKEZSQU1FV09SS19OQU1F KTsKIAotI2RlZmluZSBVSV9TVFJJTkcoc3RyaW5nLCBjb21tZW50KSBXZWJMb2NhbGl6ZWRTdHJp bmcoJkxPQ0FMSVpBQkxFX1NUUklOR1NfQlVORExFKEZSQU1FV09SS19OQU1FKSwgc3RyaW5nKQot I2RlZmluZSBVSV9TVFJJTkdfS0VZKHN0cmluZywga2V5LCBjb21tZW50KSBXZWJMb2NhbGl6ZWRT dHJpbmcoJkxPQ0FMSVpBQkxFX1NUUklOR1NfQlVORExFKEZSQU1FV09SS19OQU1FKSwga2V5KQor I2RlZmluZSBVSV9TVFJJTkcoc3RyaW5nLCBjb21tZW50KSBXZWJMb2NhbGl6ZWRTdHJpbmdXaXRo VmFsdWUoJkxPQ0FMSVpBQkxFX1NUUklOR1NfQlVORExFKEZSQU1FV09SS19OQU1FKSwgc3RyaW5n LCBzdHJpbmcpCisjZGVmaW5lIFVJX1NUUklOR19LRVkoc3RyaW5nLCBrZXksIGNvbW1lbnQpIFdl YkxvY2FsaXplZFN0cmluZ1dpdGhWYWx1ZSgmTE9DQUxJWkFCTEVfU1RSSU5HU19CVU5ETEUoRlJB TUVXT1JLX05BTUUpLCBrZXksIHN0cmluZykKIAogI2Vsc2UKIAotI2RlZmluZSBVSV9TVFJJTkco c3RyaW5nLCBjb21tZW50KSBXZWJMb2NhbGl6ZWRTdHJpbmcoMCwgc3RyaW5nKQotI2RlZmluZSBV SV9TVFJJTkdfS0VZKHN0cmluZywga2V5LCBjb21tZW50KSBXZWJMb2NhbGl6ZWRTdHJpbmcoMCwg a2V5KQorI2RlZmluZSBVSV9TVFJJTkcoc3RyaW5nLCBjb21tZW50KSBXZWJMb2NhbGl6ZWRTdHJp bmdXaXRoVmFsdWUoMCwgc3RyaW5nLCBzdHJpbmcpCisjZGVmaW5lIFVJX1NUUklOR19LRVkoc3Ry aW5nLCBrZXksIGNvbW1lbnQpIFdlYkxvY2FsaXplZFN0cmluZ1dpdGhWYWx1ZSgwLCBrZXksIHN0 cmluZykKIAogI2VuZGlmCg==