<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[177825] trunk/Source/WebKit/mac</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177825">177825</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-12-30 12:43:00 -0800 (Tue, 30 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Enable the compiler to check format strings specified with UI_STRING and UI_STRING_KEY
https://bugs.webkit.org/show_bug.cgi?id=140003
Reviewed by Darin Adler.
* Misc/WebLocalizableStrings.h: Made UI_STRING and UI_STRING_KEY call a new helper function
that takes their "string" parameter as a "value" "parameter and has an attribute telling
the compiler that if the "value" parameter is a format string then the function returns a
modified version of it. The result is that if UI_STRING is used as a format string parameter
to some function or method, the compiler will check the format specifiers in the string
against the other parameters.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebLocalizableStringsh">trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177824 => 177825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-30 18:40:20 UTC (rev 177824)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-30 20:43:00 UTC (rev 177825)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-12-30 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Enable the compiler to check format strings specified with UI_STRING and UI_STRING_KEY
+ https://bugs.webkit.org/show_bug.cgi?id=140003
+
+ Reviewed by Darin Adler.
+
+ * Misc/WebLocalizableStrings.h: Made UI_STRING and UI_STRING_KEY call a new helper function
+ that takes their "string" parameter as a "value" "parameter and has an attribute telling
+ the compiler that if the "value" parameter is a format string then the function returns a
+ modified version of it. The result is that if UI_STRING is used as a format string parameter
+ to some function or method, the compiler will check the format specifiers in the string
+ against the other parameters.
+
</ins><span class="cx"> 2014-12-29 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebLocalizableStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h (177824 => 177825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h 2014-12-30 18:40:20 UTC (rev 177824)
+++ trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h 2014-12-30 20:43:00 UTC (rev 177825)
</span><span class="lines">@@ -28,11 +28,15 @@
</span><span class="cx">
</span><span class="cx"> #if __OBJC__
</span><span class="cx"> @class NSBundle;
</span><del>-#elif __cplusplus
</del><ins>+typedef NSString *WebLocalizedStringType;
+#else
+#if __cplusplus
</ins><span class="cx"> class NSBundle;
</span><span class="cx"> #else
</span><span class="cx"> typedef struct NSBundle NSBundle;
</span><span class="cx"> #endif
</span><ins>+typedef CFStringRef WebLocalizedStringType;
+#endif
</ins><span class="cx">
</span><span class="cx"> typedef struct {
</span><span class="cx"> const char *identifier;
</span><span class="lines">@@ -43,11 +47,7 @@
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __OBJC__
-NSString *WebLocalizedString(WebLocalizableStringsBundle *bundle, const char *key);
-#else
-CFStringRef WebLocalizedString(WebLocalizableStringsBundle *bundle, const char *key);
-#endif
</del><ins>+WebLocalizedStringType WebLocalizedString(WebLocalizableStringsBundle* bundle, const char* key);
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> void LoadWebLocalizedStrings(void); // The first WebLocalizedString call can take over 20ms unless this function is called beforehand.
</span><span class="lines">@@ -57,18 +57,23 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static inline __attribute__((format_arg(3))) WebLocalizedStringType WebLocalizedStringWithValue(WebLocalizableStringsBundle* bundle, const char* key, const char* value)
+{
+ return WebLocalizedString(bundle, key);
+}
+
</ins><span class="cx"> #ifdef FRAMEWORK_NAME
</span><span class="cx">
</span><span class="cx"> #define LOCALIZABLE_STRINGS_BUNDLE(F) LOCALIZABLE_STRINGS_BUNDLE_HELPER(F)
</span><span class="cx"> #define LOCALIZABLE_STRINGS_BUNDLE_HELPER(F) F ## LocalizableStringsBundle
</span><span class="cx"> extern WebLocalizableStringsBundle LOCALIZABLE_STRINGS_BUNDLE(FRAMEWORK_NAME);
</span><span class="cx">
</span><del>-#define UI_STRING(string, comment) WebLocalizedString(&LOCALIZABLE_STRINGS_BUNDLE(FRAMEWORK_NAME), string)
-#define UI_STRING_KEY(string, key, comment) WebLocalizedString(&LOCALIZABLE_STRINGS_BUNDLE(FRAMEWORK_NAME), key)
</del><ins>+#define UI_STRING(string, comment) WebLocalizedStringWithValue(&LOCALIZABLE_STRINGS_BUNDLE(FRAMEWORK_NAME), string, string)
+#define UI_STRING_KEY(string, key, comment) WebLocalizedStringWithValue(&LOCALIZABLE_STRINGS_BUNDLE(FRAMEWORK_NAME), key, string)
</ins><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><del>-#define UI_STRING(string, comment) WebLocalizedString(0, string)
-#define UI_STRING_KEY(string, key, comment) WebLocalizedString(0, key)
</del><ins>+#define UI_STRING(string, comment) WebLocalizedStringWithValue(0, string, string)
+#define UI_STRING_KEY(string, key, comment) WebLocalizedStringWithValue(0, key, string)
</ins><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>