Changeset 205478 in webkit

Timestamp:

Sep 6, 2016 7:32:02 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r205461.
​https://bugs.webkit.org/show_bug.cgi?id=161628

Introduced "Use of uninitialized value $original in sprintf"
warning (Requested by mcatanzaro on #webkit).

Reverted changeset:

""Redundant argument in sprintf" warning spam from prepare-
ChangeLog"
​https://bugs.webkit.org/show_bug.cgi?id=161606
​http://trac.webkit.org/changeset/205461

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-06  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r205461.
+        https://bugs.webkit.org/show_bug.cgi?id=161628
+
+        Introduced "Use of uninitialized value $original in sprintf"
+        warning (Requested by mcatanzaro on #webkit).
+
+        Reverted changeset:
+
+        ""Redundant argument in sprintf" warning spam from prepare-
+        ChangeLog"
+        https://bugs.webkit.org/show_bug.cgi?id=161606
+        http://trac.webkit.org/changeset/205461
+
 2016-09-06  Youenn Fablet  <youenn@apple.com>
 

trunk/Tools/Scripts/prepare-ChangeLog

@@ -2326 +2326 @@
 
     my %svn = (
-        "A" => defined $original ? sprintf(" Copied from \%s.", $original) : " Added.",
+        "A" => defined $original ? " Copied from \%s." : " Added.",
         "D" => " Removed.",
         "M" => "",
-        "R" => defined $original ? sprintf(" Replaced with \%s.", $original) : " Replaced.",
+        "R" => defined $original ? " Replaced with \%s." : " Replaced.",
         " " => "",
     );
@@ -2335 +2335 @@
     my %git = %svn;
     $git{"A"} = " Added.";
-    $git{"C"} = sprintf(" Copied from \%s.", $original);
-    $git{"R"} = sprintf(" Renamed from \%s.", $original);
+    $git{"C"} = " Copied from \%s.";
+    $git{"R"} = " Renamed from \%s.";
 
     my $description;
-    $description = $svn{$status} if isSVN() && exists $svn{$status};
-    $description = $git{$status} if isGit() && exists $git{$status};
+    $description = sprintf($svn{$status}, $original) if isSVN() && exists $svn{$status};
+    $description = sprintf($git{$status}, $original) if isGit() && exists $git{$status};
     return unless defined $description;