From 3cd1a47af68f5291519fa17b3fb7555165c393c5 Mon Sep 17 00:00:00 2001 From: "rickg%netscape.com" Date: Fri, 19 Nov 1999 08:10:40 +0000 Subject: [PATCH] corrected type mismatch in memory error status of nsStrings; r=none git-svn-id: svn://10.0.0.236/trunk@53986 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/obsolete/nsStr.cpp | 6 +++--- mozilla/xpcom/ds/nsStr.cpp | 6 +++--- mozilla/xpcom/string/obsolete/nsStr.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mozilla/string/obsolete/nsStr.cpp b/mozilla/string/obsolete/nsStr.cpp index dc1a0379c37..c0f78afc224 100644 --- a/mozilla/string/obsolete/nsStr.cpp +++ b/mozilla/string/obsolete/nsStr.cpp @@ -42,8 +42,8 @@ //static const char* kCallFindChar = "For better performance, call FindChar() for targets whose length==1."; //static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1."; -static const PRUnichar gCommonEmptyBuffer[1] = {0}; -static nsresult gStringAcquiredMemory = NS_OK; +static const PRUnichar gCommonEmptyBuffer[1] = {0}; +static PRBool gStringAcquiredMemory = PR_TRUE; /** * This method initializes all the members of the nsStr structure @@ -667,7 +667,7 @@ PRBool nsStr::Realloc(nsStr& aDest,PRUint32 aCount){ * Retrieve last memory error * * @update gess 10/11/99 - * @return memory error (usually returns NS_OK) + * @return memory error (usually returns PR_TRUE) */ PRBool nsStr::DidAcquireMemory(void) { return gStringAcquiredMemory; diff --git a/mozilla/xpcom/ds/nsStr.cpp b/mozilla/xpcom/ds/nsStr.cpp index dc1a0379c37..c0f78afc224 100644 --- a/mozilla/xpcom/ds/nsStr.cpp +++ b/mozilla/xpcom/ds/nsStr.cpp @@ -42,8 +42,8 @@ //static const char* kCallFindChar = "For better performance, call FindChar() for targets whose length==1."; //static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1."; -static const PRUnichar gCommonEmptyBuffer[1] = {0}; -static nsresult gStringAcquiredMemory = NS_OK; +static const PRUnichar gCommonEmptyBuffer[1] = {0}; +static PRBool gStringAcquiredMemory = PR_TRUE; /** * This method initializes all the members of the nsStr structure @@ -667,7 +667,7 @@ PRBool nsStr::Realloc(nsStr& aDest,PRUint32 aCount){ * Retrieve last memory error * * @update gess 10/11/99 - * @return memory error (usually returns NS_OK) + * @return memory error (usually returns PR_TRUE) */ PRBool nsStr::DidAcquireMemory(void) { return gStringAcquiredMemory; diff --git a/mozilla/xpcom/string/obsolete/nsStr.cpp b/mozilla/xpcom/string/obsolete/nsStr.cpp index dc1a0379c37..c0f78afc224 100644 --- a/mozilla/xpcom/string/obsolete/nsStr.cpp +++ b/mozilla/xpcom/string/obsolete/nsStr.cpp @@ -42,8 +42,8 @@ //static const char* kCallFindChar = "For better performance, call FindChar() for targets whose length==1."; //static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1."; -static const PRUnichar gCommonEmptyBuffer[1] = {0}; -static nsresult gStringAcquiredMemory = NS_OK; +static const PRUnichar gCommonEmptyBuffer[1] = {0}; +static PRBool gStringAcquiredMemory = PR_TRUE; /** * This method initializes all the members of the nsStr structure @@ -667,7 +667,7 @@ PRBool nsStr::Realloc(nsStr& aDest,PRUint32 aCount){ * Retrieve last memory error * * @update gess 10/11/99 - * @return memory error (usually returns NS_OK) + * @return memory error (usually returns PR_TRUE) */ PRBool nsStr::DidAcquireMemory(void) { return gStringAcquiredMemory;