Title: [205461] trunk/Tools
Revision
205461
Author
[email protected]
Date
2016-09-05 17:03:08 -0700 (Mon, 05 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.

* Scripts/prepare-ChangeLog:
(statusDescription):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (205460 => 205461)


--- trunk/Tools/ChangeLog	2016-09-05 23:57:17 UTC (rev 205460)
+++ trunk/Tools/ChangeLog	2016-09-06 00:03:08 UTC (rev 205461)
@@ -1,5 +1,17 @@
 2016-09-05  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.
+
+        * Scripts/prepare-ChangeLog:
+        (statusDescription):
+
+2016-09-05  Michael Catanzaro  <[email protected]>
+
         [GTK] Skip several failing API tests
 
         Unfortunately we don't have any form of test expectations for API tests, so we'll just skip

Modified: trunk/Tools/Scripts/prepare-ChangeLog (205460 => 205461)


--- trunk/Tools/Scripts/prepare-ChangeLog	2016-09-05 23:57:17 UTC (rev 205460)
+++ trunk/Tools/Scripts/prepare-ChangeLog	2016-09-06 00:03:08 UTC (rev 205461)
@@ -2325,21 +2325,21 @@
     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.";
+    $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

Reply via email to