BUG#: 4944

TITLE: Resolve ATTNs in XmlWriter.cpp
DESCRIPTION: Clean up a few outstanding action comments.

diff --git a/src/Pegasus/Common/XmlWriter.cpp b/src/Pegasus/Common/XmlWriter.cpp
index 8ea3dfb2f069a9c01c2f9d5ea6c31734bc5e2600..9589dcbf6e0632591023e3b4b30d1d337d99b92d 100644 (file)
--- a/src/Pegasus/Common/XmlWriter.cpp
+++ b/src/Pegasus/Common/XmlWriter.cpp
@@ -658,6 +658,9 @@ static const char _is_uri[128] =
     0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,
 };
 
+// Perform the necessary URI encoding of characters in HTTP header values.
+// This is required by the HTTP/1.1 specification and the CIM/HTTP
+// Specification (section 3.3.2).
 static void _xmlWritter_encodeURIChar(String& outString, Sint8 char8)
 {
     Uint8 c = (Uint8)char8;
@@ -1023,7 +1026,9 @@ inline void _xmlWritter_appendValue(Buffer& out, const String& x)
 
 inline void _xmlWritter_appendValue(Buffer& out, const CIMDateTime& x)
 {
-    out << x.toString();  //ATTN: append() method?
+    // It is not necessary to use XmlWriter::appendSpecial(), because
+    // CIMDateTime values do not contain special characters.
+    out << x.toString();
 }
 
 inline void _xmlWritter_appendValue(Buffer& out, const CIMObjectPath& x)
@@ -2013,9 +2018,6 @@ void XmlWriter::appendHttpErrorResponseHeader(
     }
     if (errorDetail != String::EMPTY)
     {
-        // ATTN-RK-P3-20020404: It is critical that this text not contain '\n'
-        // ATTN-RK-P3-20020404: Need to encode this value properly.  (See
-        // CIM/HTTP Specification section 3.3.2
         out << STRLIT(PEGASUS_HTTPHEADERTAG_ERRORDETAIL ": ")
             << encodeURICharacters(errorDetail) << STRLIT("\r\n");
     }
@@ -2419,30 +2421,6 @@ void XmlWriter::appendStringIParameter(
     _appendIParamValueElementEnd(out);
 }
 
-//------------------------------------------------------------------------------
-//
-// appendQualifierNameIParameter()
-//
-//------------------------------------------------------------------------------
-
-void XmlWriter::appendQualifierNameIParameter(
-    Buffer& out,
-    const char* name,
-    const String& qualifierName)
-{
-    // <!ELEMENT IPARAMVALUE (VALUE|VALUE.ARRAY|VALUE.REFERENCE
-    //     |INSTANCENAME|CLASSNAME|QUALIFIER.DECLARATION
-    //     |CLASS|INSTANCE|VALUE.NAMEDINSTANCE)?>
-    //
-    // ATTN: notice that there is really no way to pass a qualifier name
-    // as an IPARAMVALUE element according to the spec (look above). So we
-    // just pass it as a class name. An answer must be obtained later.
-
-    _appendIParamValueElementBegin(out, name);
-    appendClassNameElement(out, qualifierName);
-    _appendIParamValueElementEnd(out);
-}
-
 //------------------------------------------------------------------------------
 //
 // appendClassNameIParameter()

diff --git a/src/Pegasus/Common/XmlWriter.h b/src/Pegasus/Common/XmlWriter.h
index f614183017db626208a9657a249a67a22b51da32..41f528025c1047c053d23e236928be080d7af1fb 100644 (file)
--- a/src/Pegasus/Common/XmlWriter.h
+++ b/src/Pegasus/Common/XmlWriter.h
@@ -306,11 +306,6 @@ public:
         const char* name,
         const String& str);
 
-    static void appendQualifierNameIParameter(
-        Buffer& out,
-        const char* name,
-        const String& qualifierName);
-
     static void appendClassNameIParameter(
         Buffer& out,
         const char* name,