PEP#: 4200

TITLE: Fixed non-compliant coding naming conventions.

DESCRIPTION: Renamed appendAscii7() to appendASCII7().

diff --git a/src/Pegasus/Common/String.cpp b/src/Pegasus/Common/String.cpp
index 6898432fab8c500f88689f580495374199855830..e1313de28c6e54e6b54bbdf3969f729fd6a04b75 100644 (file)
--- a/src/Pegasus/Common/String.cpp
+++ b/src/Pegasus/Common/String.cpp
@@ -461,7 +461,7 @@ StringRep* StringRep::create(const char* data, size_t size)
     return rep;
 }
 
-StringRep* StringRep::createAscii7(const char* data, size_t size)
+StringRep* StringRep::createASCII7(const char* data, size_t size)
 {
     StringRep* rep = StringRep::alloc(size);
     _copy((Uint16*)rep->data, data, size);
@@ -516,7 +516,7 @@ String::String(const char* str)
 String::String(const char* str, String::ASCII7Tag tag)
 {
     _check_null_pointer(str);
-    _rep = StringRep::createAscii7(str, strlen(str));
+    _rep = StringRep::createASCII7(str, strlen(str));
 }
 
 String::String(const char* str, Uint32 n)
@@ -528,7 +528,7 @@ String::String(const char* str, Uint32 n)
 String::String(const char* str, size_t n, String::ASCII7Tag tag)
 {
     _check_null_pointer(str);
-    _rep = StringRep::createAscii7(str, n);
+    _rep = StringRep::createASCII7(str, n);
 }
 
 String::String(const String& s1, const String& s2)
@@ -609,7 +609,7 @@ String& String::assign(const char* str, Uint32 n)
     return *this;
 }
 
-String& String::assignAscii7(const char* str, Uint32 n)
+String& String::assignASCII7(const char* str, Uint32 n)
 {
     _check_null_pointer(str);
 
@@ -1254,7 +1254,7 @@ String optimizations:
 
            String s("hello world", String::ASCII7);
 
-           s.assignAscii7("hello world");
+           s.assignASCII7("hello world");
 
        This avoids checking for UTF8 when it is not needed.
 

diff --git a/src/Pegasus/Common/String.h b/src/Pegasus/Common/String.h
index b278394b73ce8158e08251b9557fa7736109cbb7..a8d4652beaeff6b699f597702bf116ceecf8af28 100644 (file)
--- a/src/Pegasus/Common/String.h
+++ b/src/Pegasus/Common/String.h
@@ -476,9 +476,9 @@ public:
 
     String& operator=(const char* str);
 
-    String& assignAscii7(const char* str);
+    String& assignASCII7(const char* str);
 
-    String& assignAscii7(const char* str, Uint32 n);
+    String& assignASCII7(const char* str, Uint32 n);
 
     Uint32 find(const char* s) const;
 

diff --git a/src/Pegasus/Common/StringInline.h b/src/Pegasus/Common/StringInline.h
index 81c5b73acc8f3ecbeda3145d658fd3c1319858ad..ccb0e76fde17ddb4050f93c1c8a9b33a6f02d2b9 100644 (file)
--- a/src/Pegasus/Common/StringInline.h
+++ b/src/Pegasus/Common/StringInline.h
@@ -46,7 +46,7 @@ struct StringRep
 
     static StringRep* create(const char* data, size_t size);
 
-    static StringRep* createAscii7(const char* data, size_t size);
+    static StringRep* createASCII7(const char* data, size_t size);
 
     static StringRep* copy_on_write(StringRep* rep);
 
@@ -176,9 +176,9 @@ PEGASUS_STRING_INLINE String& String::assign(const char* str)
     return assign(str, strlen(str));
 }
 
-PEGASUS_STRING_INLINE String& String::assignAscii7(const char* str)
+PEGASUS_STRING_INLINE String& String::assignASCII7(const char* str)
 {
-    return assignAscii7(str, strlen(str));
+    return assignASCII7(str, strlen(str));
 }
 
 PEGASUS_STRING_INLINE Uint32 String::find(const String& s) const