Changeset 205483 in webkit

Timestamp:

Sep 6, 2016 9:24:02 AM (8 years ago)

Author:

Michael Catanzaro

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/prepare-ChangeLog (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+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):
+
 2016-09-06  Youenn Fablet  <youenn@apple.com>
 

trunk/Tools/Scripts/prepare-ChangeLog

@@ -2326 +2326 @@
 
     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.",
         " " => "",
     );
@@ -2335 +2335 @@
     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;