<!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>[205483] trunk/Tools</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/205483">205483</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2016-09-06 09:24:02 -0700 (Tue, 06 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>"Redundant argument in sprintf" warning spam from prepare-ChangeLog
https://bugs.webkit.org/show_bug.cgi?id=161606
Reviewed by Darin Adler.
Avoid extra arguments in call to sprintf, hopefully without introducing new warnings this
time.
* Scripts/prepare-ChangeLog:
(statusDescription):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsprepareChangeLog">trunk/Tools/Scripts/prepare-ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205482 => 205483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-06 16:15:30 UTC (rev 205482)
+++ trunk/Tools/ChangeLog 2016-09-06 16:24:02 UTC (rev 205483)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-06 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ "Redundant argument in sprintf" warning spam from prepare-ChangeLog
+ https://bugs.webkit.org/show_bug.cgi?id=161606
+
+ Reviewed by Darin Adler.
+
+ Avoid extra arguments in call to sprintf, hopefully without introducing new warnings this
+ time.
+
+ * Scripts/prepare-ChangeLog:
+ (statusDescription):
+
</ins><span class="cx"> 2016-09-06 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Using tests-options.json to compute whether tests are slow
</span></span></pre></div>
<a id="trunkToolsScriptsprepareChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/prepare-ChangeLog (205482 => 205483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/prepare-ChangeLog 2016-09-06 16:15:30 UTC (rev 205482)
+++ trunk/Tools/Scripts/prepare-ChangeLog 2016-09-06 16:24:02 UTC (rev 205483)
</span><span class="lines">@@ -2325,21 +2325,23 @@
</span><span class="cx"> my $propertyDescription = defined $propertyChanges ? propertyChangeDescription($propertyChanges) : "";
</span><span class="cx">
</span><span class="cx"> my %svn = (
</span><del>- "A" => defined $original ? " Copied from \%s." : " Added.",
</del><ins>+ "A" => defined $original ? sprintf(" Copied from \%s.", $original) : " Added.",
</ins><span class="cx"> "D" => " Removed.",
</span><span class="cx"> "M" => "",
</span><del>- "R" => defined $original ? " Replaced with \%s." : " Replaced.",
</del><ins>+ "R" => defined $original ? sprintf(" Replaced with \%s.", $original) : " Replaced.",
</ins><span class="cx"> " " => "",
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> my %git = %svn;
</span><span class="cx"> $git{"A"} = " Added.";
</span><del>- $git{"C"} = " Copied from \%s.";
- $git{"R"} = " Renamed from \%s.";
</del><ins>+ if (defined $original) {
+ $git{"C"} = sprintf(" Copied from \%s.", $original);
+ $git{"R"} = sprintf(" Renamed from \%s.", $original);
+ }
</ins><span class="cx">
</span><span class="cx"> my $description;
</span><del>- $description = sprintf($svn{$status}, $original) if isSVN() && exists $svn{$status};
- $description = sprintf($git{$status}, $original) if isGit() && exists $git{$status};
</del><ins>+ $description = $svn{$status} if isSVN() && exists $svn{$status};
+ $description = $git{$status} if isGit() && exists $git{$status};
</ins><span class="cx"> return unless defined $description;
</span><span class="cx">
</span><span class="cx"> $description .= $propertyDescription unless isAddedStatus($status);
</span></span></pre>
</div>
</div>
</body>
</html>