Title: [205483] trunk/Tools
- Revision
- 205483
- Author
- [email protected]
- Date
- 2016-09-06 09:24:02 -0700 (Tue, 06 Sep 2016)
Log Message
"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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (205482 => 205483)
--- trunk/Tools/ChangeLog 2016-09-06 16:15:30 UTC (rev 205482)
+++ trunk/Tools/ChangeLog 2016-09-06 16:24:02 UTC (rev 205483)
@@ -1,3 +1,16 @@
+2016-09-06 Michael Catanzaro <[email protected]>
+
+ "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):
+
2016-09-06 Youenn Fablet <[email protected]>
Using tests-options.json to compute whether tests are slow
Modified: trunk/Tools/Scripts/prepare-ChangeLog (205482 => 205483)
--- 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)
@@ -2325,21 +2325,23 @@
my $propertyDescription = defined $propertyChanges ? propertyChangeDescription($propertyChanges) : "";
my %svn = (
- "A" => defined $original ? " Copied from \%s." : " Added.",
+ "A" => defined $original ? sprintf(" Copied from \%s.", $original) : " Added.",
"D" => " Removed.",
"M" => "",
- "R" => defined $original ? " Replaced with \%s." : " Replaced.",
+ "R" => defined $original ? sprintf(" Replaced with \%s.", $original) : " Replaced.",
" " => "",
);
my %git = %svn;
$git{"A"} = " Added.";
- $git{"C"} = " Copied from \%s.";
- $git{"R"} = " Renamed from \%s.";
+ if (defined $original) {
+ $git{"C"} = sprintf(" Copied from \%s.", $original);
+ $git{"R"} = sprintf(" Renamed from \%s.", $original);
+ }
my $description;
- $description = sprintf($svn{$status}, $original) if isSVN() && exists $svn{$status};
- $description = sprintf($git{$status}, $original) if isGit() && exists $git{$status};
+ $description = $svn{$status} if isSVN() && exists $svn{$status};
+ $description = $git{$status} if isGit() && exists $git{$status};
return unless defined $description;
$description .= $propertyDescription unless isAddedStatus($status);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
