From dbd76fc70f8a562a3d6f58eed04f43b7fac8dd04 Mon Sep 17 00:00:00 2001
From: "rickg%netscape.com"
 <rickg%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 24 Feb 2000 08:20:03 +0000
Subject: [PATCH] fixed bug28837 (r=troy; a=jar). Removed warnings (r=troy)

git-svn-id: svn://10.0.0.236/trunk@61599 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/obsolete/nsStr.h             |  2 +-
 mozilla/string/obsolete/nsString.cpp        | 24 +++++------
 mozilla/string/obsolete/nsString.h          |  6 +--
 mozilla/string/obsolete/nsString2.cpp       | 47 ++++++++-------------
 mozilla/string/obsolete/nsString2.h         | 10 ++---
 mozilla/xpcom/ds/nsStr.h                    |  2 +-
 mozilla/xpcom/ds/nsString.cpp               | 24 +++++------
 mozilla/xpcom/ds/nsString.h                 |  6 +--
 mozilla/xpcom/ds/nsString2.cpp              | 47 ++++++++-------------
 mozilla/xpcom/ds/nsString2.h                | 10 ++---
 mozilla/xpcom/string/obsolete/nsStr.h       |  2 +-
 mozilla/xpcom/string/obsolete/nsString.cpp  | 24 +++++------
 mozilla/xpcom/string/obsolete/nsString.h    |  6 +--
 mozilla/xpcom/string/obsolete/nsString2.cpp | 47 ++++++++-------------
 mozilla/xpcom/string/obsolete/nsString2.h   | 10 ++---
 15 files changed, 114 insertions(+), 153 deletions(-)

diff --git a/mozilla/string/obsolete/nsStr.h b/mozilla/string/obsolete/nsStr.h
index 7bcdd560338..70c16c5bdb5 100644
--- a/mozilla/string/obsolete/nsStr.h
+++ b/mozilla/string/obsolete/nsStr.h
@@ -481,7 +481,7 @@ inline void Recycle( PRUnichar* aBuffer) { nsAllocator::Free(aBuffer); }
 */
 inline PRUnichar GetCharAt(const nsStr& aDest,PRUint32 anIndex){
   if(anIndex<aDest.mLength)  {
-    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : aDest.mStr[anIndex];
+    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : (PRUnichar)aDest.mStr[anIndex];
   }//if
   return 0;
 }
diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp
index 52b0aca892e..f9cfd88b616 100644
--- a/mozilla/string/obsolete/nsString.cpp
+++ b/mozilla/string/obsolete/nsString.cpp
@@ -139,7 +139,7 @@ void nsCString::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const {
  * @param   anIndex -- new length of string
  * @return  nada
  */
-void nsCString::Truncate(PRInt32 anIndex) {
+void nsCString::Truncate(PRUint32 anIndex) {
   nsStr::Truncate(*this,anIndex);
 }
 
@@ -591,15 +591,15 @@ nsCString* nsCString::ToNewString() const {
 /**
  * Creates an ascii clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
- * @update  gess 01/04/99
+ * @update  gess 02/24/00
  * @return  ptr to new ascii string
  */
 char* nsCString::ToNewCString() const {
-  nsCString temp(*this);
-  temp.SetCapacity(8);
-  char* result=temp.mStr;
-  temp.mStr=0;
-  return result;
+  nsCString temp(*this);  //construct nsCString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);    //force it to have an allocated buffer, even if this is empty.
+  char* result=temp.mStr; //steal temp's buffer
+  temp.mStr=0;            //clear temp's buffer to prevent deallocation
+  return result;          //and return the char*
 }
 
 /**
@@ -609,11 +609,11 @@ char* nsCString::ToNewCString() const {
  * @return  ptr to new ascii string
  */
 PRUnichar* nsCString::ToNewUnicode() const {
-  nsString temp(mStr,mLength);
-  temp.SetCapacity(8);
-  PRUnichar* result=temp.mUStr;
-  temp.mStr=0;
-  temp.mOwnsBuffer=PR_FALSE;
+  nsString temp(*this);         //construct nsCString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);          //force temp to have an allocated buffer, even if this is empty.
+  PRUnichar* result=temp.mUStr; //steal temp's buffer
+  temp.mStr=0;                  //now clear temp's buffer to prevent deallocation
+  temp.mOwnsBuffer=PR_FALSE;    //and return the PRUnichar*
   return result;
 }
 
diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h
index 37ec47509e0..78c405a2be0 100644
--- a/mozilla/string/obsolete/nsString.h
+++ b/mozilla/string/obsolete/nsString.h
@@ -128,7 +128,7 @@ public:
    * @param   anIndex -- new length of string
    * @return  nada
    */
-  void Truncate(PRInt32 anIndex=0);
+  void Truncate(PRUint32 anIndex=0);
 
 
   /**
@@ -400,7 +400,7 @@ public:
    * @param   various...
    * @return  this
    */
-  nsCString& operator+=(const nsCString& aString){return Append(aString,aString.mLength);}
+  nsCString& operator+=(const nsCString& aString){return Append(aString,(PRInt32)aString.mLength);}
   nsCString& operator+=(const char* aCString) {return Append(aCString);}
   nsCString& operator+=(const PRUnichar aChar){return Append(aChar);}
   nsCString& operator+=(const char aChar){return Append(aChar);}
@@ -413,7 +413,7 @@ public:
    *  @param   aString is the source to be appended to this
    *  @return  number of chars copied
    */
-  nsCString& Append(const nsCString& aString) {return Append(aString,aString.mLength);}
+  nsCString& Append(const nsCString& aString) {return Append(aString,(PRInt32)aString.mLength);}
  
 
   /*
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index 0dfab1611b2..7c0fabf640b 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -149,7 +149,7 @@ void nsString::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const {
  * @param   anIndex -- new length of string
  * @return  nada
  */
-void nsString::Truncate(PRInt32 anIndex) {
+void nsString::Truncate(PRUint32 anIndex) {
   nsStr::Truncate(*this,anIndex);
 }
 
@@ -661,23 +661,19 @@ nsString* nsString::ToNewString() const {
 /**
  * Creates an ascii clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
- * @update  gess 01/04/99
+ * @update  gess 02/24/00
+ * @WARNING! Potential i18n issue here, since we're stepping down from 2byte chars to 1byte chars!
  * @return  ptr to new ascii string
  */
 char* nsString::ToNewCString() const {
-  nsCString temp(*this);
-  temp.SetCapacity(8); //ensure that we get an allocated buffer instead of the common empty one.
-  char* result=temp.mStr;
-  temp.mStr=0;
-  temp.mOwnsBuffer=PR_FALSE;
 
-#ifdef RICKG_DEBUG
-//  fstream& theStream=GetLogStream();
-//  theStream << "tonewcString() " << result << endl;
-#endif
-  
-  return result;
+  nsCString temp(*this);  //construct nsCString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);    //force it to have an allocated buffer, even if this is empty.
+  char* result=temp.mStr; //steal temp's buffer
+  temp.mStr=0;            //clear temp's buffer to prevent deallocation
+  return result;          //and return the char*
 }
+
 /**
  * Creates an UTF8 clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
@@ -761,26 +757,17 @@ char* nsString::ToNewUTF8String() const {
 /**
  * Creates an ascii clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
- * @update  gess 01/04/99
+ * @update  gess 02/24/00
  * @return  ptr to new ascii string
  */
 PRUnichar* nsString::ToNewUnicode() const {
-  PRUnichar* result=0;
-  if(eOneByte==mCharSize) {
-    nsString temp(mStr);
-    temp.SetCapacity(8);
-    result=temp.mUStr;
-    temp.mStr=0;
-    temp.mOwnsBuffer=PR_FALSE;
-  }
-  else{
-    nsString temp(mUStr);
-    temp.SetCapacity(8);
-    result=temp.mUStr;
-    temp.mStr=0;
-    temp.mOwnsBuffer=PR_FALSE;
-  }
-  return result;
+
+  nsString temp(*this);         //construct nsString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);          //force it to have an allocated buffer, even if this is empty.
+  PRUnichar* result=temp.mUStr; //steal temp's buffer
+  temp.mStr=0;                  //clear temp's buffer to prevent deallocation
+  temp.mOwnsBuffer=PR_FALSE;
+  return result;                //and return the PRUnichar* to the caller
 }
 
 /**
diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h
index 503138eae6a..1b8221849c8 100644
--- a/mozilla/string/obsolete/nsString2.h
+++ b/mozilla/string/obsolete/nsString2.h
@@ -141,7 +141,7 @@ public:
    * @param   anIndex -- new length of string
    * @return  nada
    */
-  void Truncate(PRInt32 anIndex=0);
+  void Truncate(PRUint32 anIndex=0);
 
 
   /**
@@ -443,8 +443,8 @@ public:
    * @param   various...
    * @return  this
    */
-  nsString& operator+=(const nsStr& aString){return Append(aString,aString.mLength);}
-  nsString& operator+=(const nsString& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const nsStr& aString){return Append(aString,(PRInt32)aString.mLength);}
+  nsString& operator+=(const nsString& aString){return Append(aString,(PRInt32)aString.mLength);}
   nsString& operator+=(const char* aCString) {return Append(aCString);}
   nsString& operator+=(const char aChar) {
     return Append((PRUnichar) (unsigned char)aChar);    
@@ -461,8 +461,8 @@ public:
    *  @param   aString is the source to be appended to this
    *  @return  number of chars copied
    */
-  nsString& Append(const nsStr& aString) {return Append(aString,aString.mLength);}
-  nsString& Append(const nsString& aString) {return Append(aString,aString.mLength);}
+  nsString& Append(const nsStr& aString) {return Append(aString,(PRInt32)aString.mLength);}
+  nsString& Append(const nsString& aString) {return Append(aString,(PRInt32)aString.mLength);}
  
 
   /*
diff --git a/mozilla/xpcom/ds/nsStr.h b/mozilla/xpcom/ds/nsStr.h
index 7bcdd560338..70c16c5bdb5 100644
--- a/mozilla/xpcom/ds/nsStr.h
+++ b/mozilla/xpcom/ds/nsStr.h
@@ -481,7 +481,7 @@ inline void Recycle( PRUnichar* aBuffer) { nsAllocator::Free(aBuffer); }
 */
 inline PRUnichar GetCharAt(const nsStr& aDest,PRUint32 anIndex){
   if(anIndex<aDest.mLength)  {
-    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : aDest.mStr[anIndex];
+    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : (PRUnichar)aDest.mStr[anIndex];
   }//if
   return 0;
 }
diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp
index 52b0aca892e..f9cfd88b616 100644
--- a/mozilla/xpcom/ds/nsString.cpp
+++ b/mozilla/xpcom/ds/nsString.cpp
@@ -139,7 +139,7 @@ void nsCString::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const {
  * @param   anIndex -- new length of string
  * @return  nada
  */
-void nsCString::Truncate(PRInt32 anIndex) {
+void nsCString::Truncate(PRUint32 anIndex) {
   nsStr::Truncate(*this,anIndex);
 }
 
@@ -591,15 +591,15 @@ nsCString* nsCString::ToNewString() const {
 /**
  * Creates an ascii clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
- * @update  gess 01/04/99
+ * @update  gess 02/24/00
  * @return  ptr to new ascii string
  */
 char* nsCString::ToNewCString() const {
-  nsCString temp(*this);
-  temp.SetCapacity(8);
-  char* result=temp.mStr;
-  temp.mStr=0;
-  return result;
+  nsCString temp(*this);  //construct nsCString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);    //force it to have an allocated buffer, even if this is empty.
+  char* result=temp.mStr; //steal temp's buffer
+  temp.mStr=0;            //clear temp's buffer to prevent deallocation
+  return result;          //and return the char*
 }
 
 /**
@@ -609,11 +609,11 @@ char* nsCString::ToNewCString() const {
  * @return  ptr to new ascii string
  */
 PRUnichar* nsCString::ToNewUnicode() const {
-  nsString temp(mStr,mLength);
-  temp.SetCapacity(8);
-  PRUnichar* result=temp.mUStr;
-  temp.mStr=0;
-  temp.mOwnsBuffer=PR_FALSE;
+  nsString temp(*this);         //construct nsCString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);          //force temp to have an allocated buffer, even if this is empty.
+  PRUnichar* result=temp.mUStr; //steal temp's buffer
+  temp.mStr=0;                  //now clear temp's buffer to prevent deallocation
+  temp.mOwnsBuffer=PR_FALSE;    //and return the PRUnichar*
   return result;
 }
 
diff --git a/mozilla/xpcom/ds/nsString.h b/mozilla/xpcom/ds/nsString.h
index 37ec47509e0..78c405a2be0 100644
--- a/mozilla/xpcom/ds/nsString.h
+++ b/mozilla/xpcom/ds/nsString.h
@@ -128,7 +128,7 @@ public:
    * @param   anIndex -- new length of string
    * @return  nada
    */
-  void Truncate(PRInt32 anIndex=0);
+  void Truncate(PRUint32 anIndex=0);
 
 
   /**
@@ -400,7 +400,7 @@ public:
    * @param   various...
    * @return  this
    */
-  nsCString& operator+=(const nsCString& aString){return Append(aString,aString.mLength);}
+  nsCString& operator+=(const nsCString& aString){return Append(aString,(PRInt32)aString.mLength);}
   nsCString& operator+=(const char* aCString) {return Append(aCString);}
   nsCString& operator+=(const PRUnichar aChar){return Append(aChar);}
   nsCString& operator+=(const char aChar){return Append(aChar);}
@@ -413,7 +413,7 @@ public:
    *  @param   aString is the source to be appended to this
    *  @return  number of chars copied
    */
-  nsCString& Append(const nsCString& aString) {return Append(aString,aString.mLength);}
+  nsCString& Append(const nsCString& aString) {return Append(aString,(PRInt32)aString.mLength);}
  
 
   /*
diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp
index 0dfab1611b2..7c0fabf640b 100644
--- a/mozilla/xpcom/ds/nsString2.cpp
+++ b/mozilla/xpcom/ds/nsString2.cpp
@@ -149,7 +149,7 @@ void nsString::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const {
  * @param   anIndex -- new length of string
  * @return  nada
  */
-void nsString::Truncate(PRInt32 anIndex) {
+void nsString::Truncate(PRUint32 anIndex) {
   nsStr::Truncate(*this,anIndex);
 }
 
@@ -661,23 +661,19 @@ nsString* nsString::ToNewString() const {
 /**
  * Creates an ascii clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
- * @update  gess 01/04/99
+ * @update  gess 02/24/00
+ * @WARNING! Potential i18n issue here, since we're stepping down from 2byte chars to 1byte chars!
  * @return  ptr to new ascii string
  */
 char* nsString::ToNewCString() const {
-  nsCString temp(*this);
-  temp.SetCapacity(8); //ensure that we get an allocated buffer instead of the common empty one.
-  char* result=temp.mStr;
-  temp.mStr=0;
-  temp.mOwnsBuffer=PR_FALSE;
 
-#ifdef RICKG_DEBUG
-//  fstream& theStream=GetLogStream();
-//  theStream << "tonewcString() " << result << endl;
-#endif
-  
-  return result;
+  nsCString temp(*this);  //construct nsCString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);    //force it to have an allocated buffer, even if this is empty.
+  char* result=temp.mStr; //steal temp's buffer
+  temp.mStr=0;            //clear temp's buffer to prevent deallocation
+  return result;          //and return the char*
 }
+
 /**
  * Creates an UTF8 clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
@@ -761,26 +757,17 @@ char* nsString::ToNewUTF8String() const {
 /**
  * Creates an ascii clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
- * @update  gess 01/04/99
+ * @update  gess 02/24/00
  * @return  ptr to new ascii string
  */
 PRUnichar* nsString::ToNewUnicode() const {
-  PRUnichar* result=0;
-  if(eOneByte==mCharSize) {
-    nsString temp(mStr);
-    temp.SetCapacity(8);
-    result=temp.mUStr;
-    temp.mStr=0;
-    temp.mOwnsBuffer=PR_FALSE;
-  }
-  else{
-    nsString temp(mUStr);
-    temp.SetCapacity(8);
-    result=temp.mUStr;
-    temp.mStr=0;
-    temp.mOwnsBuffer=PR_FALSE;
-  }
-  return result;
+
+  nsString temp(*this);         //construct nsString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);          //force it to have an allocated buffer, even if this is empty.
+  PRUnichar* result=temp.mUStr; //steal temp's buffer
+  temp.mStr=0;                  //clear temp's buffer to prevent deallocation
+  temp.mOwnsBuffer=PR_FALSE;
+  return result;                //and return the PRUnichar* to the caller
 }
 
 /**
diff --git a/mozilla/xpcom/ds/nsString2.h b/mozilla/xpcom/ds/nsString2.h
index 503138eae6a..1b8221849c8 100644
--- a/mozilla/xpcom/ds/nsString2.h
+++ b/mozilla/xpcom/ds/nsString2.h
@@ -141,7 +141,7 @@ public:
    * @param   anIndex -- new length of string
    * @return  nada
    */
-  void Truncate(PRInt32 anIndex=0);
+  void Truncate(PRUint32 anIndex=0);
 
 
   /**
@@ -443,8 +443,8 @@ public:
    * @param   various...
    * @return  this
    */
-  nsString& operator+=(const nsStr& aString){return Append(aString,aString.mLength);}
-  nsString& operator+=(const nsString& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const nsStr& aString){return Append(aString,(PRInt32)aString.mLength);}
+  nsString& operator+=(const nsString& aString){return Append(aString,(PRInt32)aString.mLength);}
   nsString& operator+=(const char* aCString) {return Append(aCString);}
   nsString& operator+=(const char aChar) {
     return Append((PRUnichar) (unsigned char)aChar);    
@@ -461,8 +461,8 @@ public:
    *  @param   aString is the source to be appended to this
    *  @return  number of chars copied
    */
-  nsString& Append(const nsStr& aString) {return Append(aString,aString.mLength);}
-  nsString& Append(const nsString& aString) {return Append(aString,aString.mLength);}
+  nsString& Append(const nsStr& aString) {return Append(aString,(PRInt32)aString.mLength);}
+  nsString& Append(const nsString& aString) {return Append(aString,(PRInt32)aString.mLength);}
  
 
   /*
diff --git a/mozilla/xpcom/string/obsolete/nsStr.h b/mozilla/xpcom/string/obsolete/nsStr.h
index 7bcdd560338..70c16c5bdb5 100644
--- a/mozilla/xpcom/string/obsolete/nsStr.h
+++ b/mozilla/xpcom/string/obsolete/nsStr.h
@@ -481,7 +481,7 @@ inline void Recycle( PRUnichar* aBuffer) { nsAllocator::Free(aBuffer); }
 */
 inline PRUnichar GetCharAt(const nsStr& aDest,PRUint32 anIndex){
   if(anIndex<aDest.mLength)  {
-    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : aDest.mStr[anIndex];
+    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : (PRUnichar)aDest.mStr[anIndex];
   }//if
   return 0;
 }
diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp
index 52b0aca892e..f9cfd88b616 100644
--- a/mozilla/xpcom/string/obsolete/nsString.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString.cpp
@@ -139,7 +139,7 @@ void nsCString::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const {
  * @param   anIndex -- new length of string
  * @return  nada
  */
-void nsCString::Truncate(PRInt32 anIndex) {
+void nsCString::Truncate(PRUint32 anIndex) {
   nsStr::Truncate(*this,anIndex);
 }
 
@@ -591,15 +591,15 @@ nsCString* nsCString::ToNewString() const {
 /**
  * Creates an ascii clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
- * @update  gess 01/04/99
+ * @update  gess 02/24/00
  * @return  ptr to new ascii string
  */
 char* nsCString::ToNewCString() const {
-  nsCString temp(*this);
-  temp.SetCapacity(8);
-  char* result=temp.mStr;
-  temp.mStr=0;
-  return result;
+  nsCString temp(*this);  //construct nsCString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);    //force it to have an allocated buffer, even if this is empty.
+  char* result=temp.mStr; //steal temp's buffer
+  temp.mStr=0;            //clear temp's buffer to prevent deallocation
+  return result;          //and return the char*
 }
 
 /**
@@ -609,11 +609,11 @@ char* nsCString::ToNewCString() const {
  * @return  ptr to new ascii string
  */
 PRUnichar* nsCString::ToNewUnicode() const {
-  nsString temp(mStr,mLength);
-  temp.SetCapacity(8);
-  PRUnichar* result=temp.mUStr;
-  temp.mStr=0;
-  temp.mOwnsBuffer=PR_FALSE;
+  nsString temp(*this);         //construct nsCString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);          //force temp to have an allocated buffer, even if this is empty.
+  PRUnichar* result=temp.mUStr; //steal temp's buffer
+  temp.mStr=0;                  //now clear temp's buffer to prevent deallocation
+  temp.mOwnsBuffer=PR_FALSE;    //and return the PRUnichar*
   return result;
 }
 
diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h
index 37ec47509e0..78c405a2be0 100644
--- a/mozilla/xpcom/string/obsolete/nsString.h
+++ b/mozilla/xpcom/string/obsolete/nsString.h
@@ -128,7 +128,7 @@ public:
    * @param   anIndex -- new length of string
    * @return  nada
    */
-  void Truncate(PRInt32 anIndex=0);
+  void Truncate(PRUint32 anIndex=0);
 
 
   /**
@@ -400,7 +400,7 @@ public:
    * @param   various...
    * @return  this
    */
-  nsCString& operator+=(const nsCString& aString){return Append(aString,aString.mLength);}
+  nsCString& operator+=(const nsCString& aString){return Append(aString,(PRInt32)aString.mLength);}
   nsCString& operator+=(const char* aCString) {return Append(aCString);}
   nsCString& operator+=(const PRUnichar aChar){return Append(aChar);}
   nsCString& operator+=(const char aChar){return Append(aChar);}
@@ -413,7 +413,7 @@ public:
    *  @param   aString is the source to be appended to this
    *  @return  number of chars copied
    */
-  nsCString& Append(const nsCString& aString) {return Append(aString,aString.mLength);}
+  nsCString& Append(const nsCString& aString) {return Append(aString,(PRInt32)aString.mLength);}
  
 
   /*
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index 0dfab1611b2..7c0fabf640b 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -149,7 +149,7 @@ void nsString::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const {
  * @param   anIndex -- new length of string
  * @return  nada
  */
-void nsString::Truncate(PRInt32 anIndex) {
+void nsString::Truncate(PRUint32 anIndex) {
   nsStr::Truncate(*this,anIndex);
 }
 
@@ -661,23 +661,19 @@ nsString* nsString::ToNewString() const {
 /**
  * Creates an ascii clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
- * @update  gess 01/04/99
+ * @update  gess 02/24/00
+ * @WARNING! Potential i18n issue here, since we're stepping down from 2byte chars to 1byte chars!
  * @return  ptr to new ascii string
  */
 char* nsString::ToNewCString() const {
-  nsCString temp(*this);
-  temp.SetCapacity(8); //ensure that we get an allocated buffer instead of the common empty one.
-  char* result=temp.mStr;
-  temp.mStr=0;
-  temp.mOwnsBuffer=PR_FALSE;
 
-#ifdef RICKG_DEBUG
-//  fstream& theStream=GetLogStream();
-//  theStream << "tonewcString() " << result << endl;
-#endif
-  
-  return result;
+  nsCString temp(*this);  //construct nsCString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);    //force it to have an allocated buffer, even if this is empty.
+  char* result=temp.mStr; //steal temp's buffer
+  temp.mStr=0;            //clear temp's buffer to prevent deallocation
+  return result;          //and return the char*
 }
+
 /**
  * Creates an UTF8 clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
@@ -761,26 +757,17 @@ char* nsString::ToNewUTF8String() const {
 /**
  * Creates an ascii clone of this string
  * Note that calls to this method should be matched with calls to Recycle().
- * @update  gess 01/04/99
+ * @update  gess 02/24/00
  * @return  ptr to new ascii string
  */
 PRUnichar* nsString::ToNewUnicode() const {
-  PRUnichar* result=0;
-  if(eOneByte==mCharSize) {
-    nsString temp(mStr);
-    temp.SetCapacity(8);
-    result=temp.mUStr;
-    temp.mStr=0;
-    temp.mOwnsBuffer=PR_FALSE;
-  }
-  else{
-    nsString temp(mUStr);
-    temp.SetCapacity(8);
-    result=temp.mUStr;
-    temp.mStr=0;
-    temp.mOwnsBuffer=PR_FALSE;
-  }
-  return result;
+
+  nsString temp(*this);         //construct nsString with alloc on heap (which we'll steal in a moment)
+  temp.SetCapacity(8);          //force it to have an allocated buffer, even if this is empty.
+  PRUnichar* result=temp.mUStr; //steal temp's buffer
+  temp.mStr=0;                  //clear temp's buffer to prevent deallocation
+  temp.mOwnsBuffer=PR_FALSE;
+  return result;                //and return the PRUnichar* to the caller
 }
 
 /**
diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h
index 503138eae6a..1b8221849c8 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.h
+++ b/mozilla/xpcom/string/obsolete/nsString2.h
@@ -141,7 +141,7 @@ public:
    * @param   anIndex -- new length of string
    * @return  nada
    */
-  void Truncate(PRInt32 anIndex=0);
+  void Truncate(PRUint32 anIndex=0);
 
 
   /**
@@ -443,8 +443,8 @@ public:
    * @param   various...
    * @return  this
    */
-  nsString& operator+=(const nsStr& aString){return Append(aString,aString.mLength);}
-  nsString& operator+=(const nsString& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const nsStr& aString){return Append(aString,(PRInt32)aString.mLength);}
+  nsString& operator+=(const nsString& aString){return Append(aString,(PRInt32)aString.mLength);}
   nsString& operator+=(const char* aCString) {return Append(aCString);}
   nsString& operator+=(const char aChar) {
     return Append((PRUnichar) (unsigned char)aChar);    
@@ -461,8 +461,8 @@ public:
    *  @param   aString is the source to be appended to this
    *  @return  number of chars copied
    */
-  nsString& Append(const nsStr& aString) {return Append(aString,aString.mLength);}
-  nsString& Append(const nsString& aString) {return Append(aString,aString.mLength);}
+  nsString& Append(const nsStr& aString) {return Append(aString,(PRInt32)aString.mLength);}
+  nsString& Append(const nsString& aString) {return Append(aString,(PRInt32)aString.mLength);}
  
 
   /*