From c3ce8681aa9bfcc4e1101abae8ac037748cd5b1e Mon Sep 17 00:00:00 2001 From: "scc%netscape.com" Date: Sun, 23 Apr 2000 01:03:28 +0000 Subject: [PATCH] Added an additional permitting and denying signatures for |NS_ConvertASCIItoUCS2| git-svn-id: svn://10.0.0.236/trunk@66889 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/obsolete/nsString2.cpp | 9 +++++++++ mozilla/string/obsolete/nsString2.h | 7 ++++++- mozilla/xpcom/ds/nsString2.cpp | 9 +++++++++ mozilla/xpcom/ds/nsString2.h | 7 ++++++- mozilla/xpcom/string/obsolete/nsString2.cpp | 9 +++++++++ mozilla/xpcom/string/obsolete/nsString2.h | 7 ++++++- 6 files changed, 45 insertions(+), 3 deletions(-) diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp index b1b4d34283f..ab155aa18bb 100644 --- a/mozilla/string/obsolete/nsString2.cpp +++ b/mozilla/string/obsolete/nsString2.cpp @@ -2315,14 +2315,23 @@ NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const char* aCString ) AppendWithConversion(aCString); } +NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( char aChar ) + { + Initialize(*this,mBuffer,(sizeof(mBuffer)>>eTwoByte)-1,0,eTwoByte,PR_FALSE); + AddNullTerminator(*this); + AppendWithConversion(aChar); + } + #if 0 #ifdef NEW_STRING_APIS NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsAReadableCString& ) { + // ... } #else NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsCString& ) { + // ... } #endif #endif diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h index 1537f556105..835d808bfb2 100644 --- a/mozilla/string/obsolete/nsString2.h +++ b/mozilla/string/obsolete/nsString2.h @@ -70,8 +70,8 @@ class NS_COM nsString : #endif public nsStr { -protected: #ifdef NEW_STRING_APIS +protected: virtual const void* Implementation() const { return "nsString"; } virtual const PRUnichar* GetReadableFragment( nsReadableFragment&, nsFragmentRequest, PRUint32 ) const; virtual PRUnichar* GetWritableFragment( nsWritableFragment&, nsFragmentRequest, PRUint32 ); @@ -942,6 +942,7 @@ class NS_COM NS_ConvertASCIItoUCS2 public: NS_ConvertASCIItoUCS2( const char* ); NS_ConvertASCIItoUCS2( const char*, PRUint32 ); + NS_ConvertASCIItoUCS2( char ); #if 0 #ifdef NEW_STRING_APIS NS_ConvertASCIItoUCS2( const nsAReadableCString& ); @@ -950,6 +951,10 @@ class NS_COM NS_ConvertASCIItoUCS2 NS_ConvertASCIItoUCS2( const nsCString& ); #endif #endif + + private: + // NOT TO BE IMPLEMENTED + NS_ConvertASCIItoUCS2( PRUnichar ); }; #define NS_ConvertToString NS_ConvertASCIItoUCS2 diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp index b1b4d34283f..ab155aa18bb 100644 --- a/mozilla/xpcom/ds/nsString2.cpp +++ b/mozilla/xpcom/ds/nsString2.cpp @@ -2315,14 +2315,23 @@ NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const char* aCString ) AppendWithConversion(aCString); } +NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( char aChar ) + { + Initialize(*this,mBuffer,(sizeof(mBuffer)>>eTwoByte)-1,0,eTwoByte,PR_FALSE); + AddNullTerminator(*this); + AppendWithConversion(aChar); + } + #if 0 #ifdef NEW_STRING_APIS NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsAReadableCString& ) { + // ... } #else NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsCString& ) { + // ... } #endif #endif diff --git a/mozilla/xpcom/ds/nsString2.h b/mozilla/xpcom/ds/nsString2.h index 1537f556105..835d808bfb2 100644 --- a/mozilla/xpcom/ds/nsString2.h +++ b/mozilla/xpcom/ds/nsString2.h @@ -70,8 +70,8 @@ class NS_COM nsString : #endif public nsStr { -protected: #ifdef NEW_STRING_APIS +protected: virtual const void* Implementation() const { return "nsString"; } virtual const PRUnichar* GetReadableFragment( nsReadableFragment&, nsFragmentRequest, PRUint32 ) const; virtual PRUnichar* GetWritableFragment( nsWritableFragment&, nsFragmentRequest, PRUint32 ); @@ -942,6 +942,7 @@ class NS_COM NS_ConvertASCIItoUCS2 public: NS_ConvertASCIItoUCS2( const char* ); NS_ConvertASCIItoUCS2( const char*, PRUint32 ); + NS_ConvertASCIItoUCS2( char ); #if 0 #ifdef NEW_STRING_APIS NS_ConvertASCIItoUCS2( const nsAReadableCString& ); @@ -950,6 +951,10 @@ class NS_COM NS_ConvertASCIItoUCS2 NS_ConvertASCIItoUCS2( const nsCString& ); #endif #endif + + private: + // NOT TO BE IMPLEMENTED + NS_ConvertASCIItoUCS2( PRUnichar ); }; #define NS_ConvertToString NS_ConvertASCIItoUCS2 diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp index b1b4d34283f..ab155aa18bb 100644 --- a/mozilla/xpcom/string/obsolete/nsString2.cpp +++ b/mozilla/xpcom/string/obsolete/nsString2.cpp @@ -2315,14 +2315,23 @@ NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const char* aCString ) AppendWithConversion(aCString); } +NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( char aChar ) + { + Initialize(*this,mBuffer,(sizeof(mBuffer)>>eTwoByte)-1,0,eTwoByte,PR_FALSE); + AddNullTerminator(*this); + AppendWithConversion(aChar); + } + #if 0 #ifdef NEW_STRING_APIS NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsAReadableCString& ) { + // ... } #else NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsCString& ) { + // ... } #endif #endif diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h index 1537f556105..835d808bfb2 100644 --- a/mozilla/xpcom/string/obsolete/nsString2.h +++ b/mozilla/xpcom/string/obsolete/nsString2.h @@ -70,8 +70,8 @@ class NS_COM nsString : #endif public nsStr { -protected: #ifdef NEW_STRING_APIS +protected: virtual const void* Implementation() const { return "nsString"; } virtual const PRUnichar* GetReadableFragment( nsReadableFragment&, nsFragmentRequest, PRUint32 ) const; virtual PRUnichar* GetWritableFragment( nsWritableFragment&, nsFragmentRequest, PRUint32 ); @@ -942,6 +942,7 @@ class NS_COM NS_ConvertASCIItoUCS2 public: NS_ConvertASCIItoUCS2( const char* ); NS_ConvertASCIItoUCS2( const char*, PRUint32 ); + NS_ConvertASCIItoUCS2( char ); #if 0 #ifdef NEW_STRING_APIS NS_ConvertASCIItoUCS2( const nsAReadableCString& ); @@ -950,6 +951,10 @@ class NS_COM NS_ConvertASCIItoUCS2 NS_ConvertASCIItoUCS2( const nsCString& ); #endif #endif + + private: + // NOT TO BE IMPLEMENTED + NS_ConvertASCIItoUCS2( PRUnichar ); }; #define NS_ConvertToString NS_ConvertASCIItoUCS2