From d0cd9d8b84cdc98c02eae4410dd7eaae6c81ca7d Mon Sep 17 00:00:00 2001
From: "scc%netscape.com" <scc%netscape.com>
Date: Sat, 15 Apr 2000 05:23:09 +0000
Subject: [PATCH] making string conversions explicit

---
 xpcom/ds/nsPersistentProperties.cpp | 2 +-
 xpcom/io/nsBinaryStream.cpp         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xpcom/ds/nsPersistentProperties.cpp b/xpcom/ds/nsPersistentProperties.cpp
index cd84057acc9..074bd5c6383 100644
--- a/xpcom/ds/nsPersistentProperties.cpp
+++ b/xpcom/ds/nsPersistentProperties.cpp
@@ -135,7 +135,7 @@ nsPersistentProperties::Load(nsIInputStream *aIn)
             c = SkipWhiteSpace(c);
           }
           else {
-            value.Append('\\');
+            value.AppendWithConversion('\\');
           }
         }
         value.Append((PRUnichar) c);
diff --git a/xpcom/io/nsBinaryStream.cpp b/xpcom/io/nsBinaryStream.cpp
index 7aeb113d2fa..e28dde42f60 100644
--- a/xpcom/io/nsBinaryStream.cpp
+++ b/xpcom/io/nsBinaryStream.cpp
@@ -303,10 +303,10 @@ nsBinaryInputStream::ReadStringZ(char* *aString)
         rv = Read(&c, 1, &actualBytesRead);
         if (NS_FAILED(rv) || actualBytesRead != 1)
             return NS_ERROR_FAILURE;
-        if (c)
-            result += c;
-        else
+        if (!c)
             break;
+
+        result.AppendWithConversion(c);
     }
 
     *aString = result.ToNewCString();