Reviewed by aliu.

        - Changed CString length from int to size_t. We sould probably do this
        for UString, too. (Darin, if you're reading this: Maciej said so.)

        * kjs/function.cpp:
        (KJS::encode):
        * kjs/ustring.cpp:
        (KJS::CString::CString):
        (KJS::operator==):
        * kjs/ustring.h:
        (KJS::CString::size):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14734 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d3ad1b536479739c2f9a6305d139940e5cbe0e00..8af607c53b34c0334d0bbd7df3eb0d368f86c888 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,18 @@
+2006-06-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by aliu.
+
+        - Changed CString length from int to size_t. We sould probably do this
+        for UString, too. (Darin, if you're reading this: Maciej said so.)
+        
+        * kjs/function.cpp:
+        (KJS::encode):
+        * kjs/ustring.cpp:
+        (KJS::CString::CString):
+        (KJS::operator==):
+        * kjs/ustring.h:
+        (KJS::CString::size):
+
 2006-06-04  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Maciej.

diff --git a/JavaScriptCore/kjs/function.cpp b/JavaScriptCore/kjs/function.cpp
index 62d2c1028e5ff89d4c0cc834eb28039495835eb1..64f3e773b5540ff825d790c19cd6fb596839db43 100644 (file)
--- a/JavaScriptCore/kjs/function.cpp
+++ b/JavaScriptCore/kjs/function.cpp
@@ -569,7 +569,7 @@ static JSValue *encode(ExecState *exec, const List &args, const char *do_not_esc
   UString r = "", s, str = args[0]->toString(exec);
   CString cstr = str.UTF8String();
   const char *p = cstr.c_str();
-  for (int k = 0; k < cstr.size(); k++, p++) {
+  for (size_t k = 0; k < cstr.size(); k++, p++) {
     char c = *p;
     if (c && strchr(do_not_escape, c)) {
       r.append(c);

diff --git a/JavaScriptCore/kjs/ustring.cpp b/JavaScriptCore/kjs/ustring.cpp
index df2c1b88392f3b1a1b2e6ec490a521bc8e174966..71328ee256a67dcf77ac5675afdca37fc5cf8e44 100644 (file)
--- a/JavaScriptCore/kjs/ustring.cpp
+++ b/JavaScriptCore/kjs/ustring.cpp
@@ -56,7 +56,7 @@ CString::CString(const char *c)
   memcpy(data, c, length + 1);
 }
 
-CString::CString(const char *c, int len)
+CString::CString(const char *c, size_t len)
 {
   length = len;
   data = new char[len+1];
@@ -128,7 +128,7 @@ CString &CString::operator=(const CString &str)
 
 bool operator==(const CString& c1, const CString& c2)
 {
-  int len = c1.size();
+  size_t len = c1.size();
   return len == c2.size() && (len == 0 || memcmp(c1.c_str(), c2.c_str(), len) == 0);
 }
 

diff --git a/JavaScriptCore/kjs/ustring.h b/JavaScriptCore/kjs/ustring.h
index 3eb11cf4977cdec0a9d79d1a82779ba5c2bf6ec0..d24d9c88a16ab4d56b66a3b5cbd52e001784a9e7 100644 (file)
--- a/JavaScriptCore/kjs/ustring.h
+++ b/JavaScriptCore/kjs/ustring.h
@@ -150,7 +150,7 @@ namespace KJS {
   public:
     CString() : data(0), length(0) { }
     CString(const char *c);
-    CString(const char *c, int len);
+    CString(const char *c, size_t len);
     CString(const CString &);
 
     ~CString();
@@ -160,11 +160,11 @@ namespace KJS {
     CString &operator=(const CString &);
     CString &operator+=(const CString &c) { return append(c); }
 
-    int size() const { return length; }
+    size_t size() const { return length; }
     const char *c_str() const { return data; }
   private:
     char *data;
-    int length;
+    size_t length;
   };
 
   /**