[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[barraclough at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 36142657e58a323dd53e0d494d09bee8e8e26ad5
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 8 23:13:49 2010 +0000

    Rubber Stamped by Oliver Hunt.
    
    Remove a couple of unnecesary C-style casts spotted by Darin.
    
    * runtime/JSGlobalObjectFunctions.cpp:
    (JSC::encode):
    (JSC::globalFuncEscape):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54514 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 165f2f6..b2842f6 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-02-08  Gavin Barraclough  <barraclough at apple.com>
 
+        Rubber Stamped by Oliver Hunt.
+
+        Remove a couple of unnecesary C-style casts spotted by Darin.
+
+        * runtime/JSGlobalObjectFunctions.cpp:
+        (JSC::encode):
+        (JSC::globalFuncEscape):
+
+2010-02-08  Gavin Barraclough  <barraclough at apple.com>
+
         Reviewed by Geoff Garen.
 
         Switch some more StringBuilder/jsNontrivialString code to use
diff --git a/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
index e5e58d0..b1c5f51 100644
--- a/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
+++ b/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
@@ -66,7 +66,7 @@ static JSValue encode(ExecState* exec, const ArgList& args, const char* doNotEsc
         else {
             char tmp[4];
             snprintf(tmp, 4, "%%%02X", static_cast<unsigned char>(c));
-            builder.append((const char*)tmp);
+            builder.append(tmp);
         }
     }
     return builder.releaseJSString(exec);
@@ -386,13 +386,13 @@ JSValue JSC_HOST_CALL globalFuncEscape(ExecState* exec, JSObject*, JSValue, cons
         if (u > 255) {
             char tmp[7];
             sprintf(tmp, "%%u%04X", u);
-            builder.append((const char*)tmp);
+            builder.append(tmp);
         } else if (u != 0 && strchr(do_not_escape, static_cast<char>(u)))
             builder.append(c, 1);
         else {
             char tmp[4];
             sprintf(tmp, "%%%02X", u);
-            builder.append((const char*)tmp);
+            builder.append(tmp);
         }
     }
 

-- 
WebKit Debian packaging