BUG#: 8728

TITLE: Warnings about static SCMO functions in SCMO.cpp

DESCRIPTION: For SCMO move stativ function declaration from header into cpp file.
 Cleaning up parameter lists of internal functions and unsed variables.

diff --git a/src/Pegasus/Common/BinaryCodec.cpp b/src/Pegasus/Common/BinaryCodec.cpp
index 85dab537036218950fca31febbdfa9fbea68f047..c16268e4072a49a55587683be262c00dbe9b8d03 100644 (file)
--- a/src/Pegasus/Common/BinaryCodec.cpp
+++ b/src/Pegasus/Common/BinaryCodec.cpp
@@ -354,7 +354,6 @@ static void _encodeEnumerateInstancesResponseBody(
 
 static CIMEnumerateInstancesResponseMessage* _decodeEnumerateInstancesResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     CIMEnumerateInstancesResponseMessage* msg;
@@ -390,7 +389,6 @@ _decodeEnumerateInstanceNamesRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     STAT_GETSTARTTIME
@@ -424,7 +422,6 @@ _decodeEnumerateInstanceNamesRequest(
 static CIMEnumerateInstanceNamesResponseMessage*
 _decodeEnumerateInstanceNamesResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     CIMEnumerateInstanceNamesResponseMessage* msg;
@@ -539,7 +536,6 @@ static CIMGetInstanceRequestMessage* _decodeGetInstanceRequest(
 
 static CIMGetInstanceResponseMessage* _decodeGetInstanceResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     CIMGetInstanceResponseMessage* msg;
@@ -633,7 +629,6 @@ static CIMCreateInstanceRequestMessage* _decodeCreateInstanceRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     STAT_GETSTARTTIME
@@ -679,7 +674,6 @@ static void _encodeCreateInstanceResponseBody(
 
 static CIMCreateInstanceResponseMessage* _decodeCreateInstanceResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     CIMObjectPath instanceName;
@@ -784,8 +778,6 @@ static CIMModifyInstanceRequestMessage* _decodeModifyInstanceRequest(
 }
 
 static void _encodeModifyInstanceResponseBody(
-    CIMBuffer& out,
-    CIMModifyInstanceResponseMessage* msg,
     CIMName& name)
 {
     /* See ../Server/CIMOperationResponseEncoder.cpp */
@@ -796,7 +788,6 @@ static void _encodeModifyInstanceResponseBody(
 
 static CIMModifyInstanceResponseMessage* _decodeModifyInstanceResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -855,7 +846,6 @@ static CIMDeleteInstanceRequestMessage* _decodeDeleteInstanceRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -889,8 +879,6 @@ static CIMDeleteInstanceRequestMessage* _decodeDeleteInstanceRequest(
 }
 
 static void _encodeDeleteInstanceResponseBody(
-    CIMBuffer& out,
-    CIMDeleteInstanceResponseMessage* msg,
     CIMName& name)
 {
     /* See ../Server/CIMOperationResponseEncoder.cpp */
@@ -900,8 +888,6 @@ static void _encodeDeleteInstanceResponseBody(
 }
 
 static CIMDeleteInstanceResponseMessage* _decodeDeleteInstanceResponse(
-    CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -1067,7 +1053,6 @@ static void _encodeAssociatorsResponseBody(
 
 static CIMAssociatorsResponseMessage* _decodeAssociatorsResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     CIMAssociatorsResponseMessage* msg;
@@ -1136,7 +1121,6 @@ static CIMAssociatorNamesRequestMessage* _decodeAssociatorNamesRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -1216,7 +1200,6 @@ static void _encodeAssociatorNamesResponseBody(
 
 static CIMAssociatorNamesResponseMessage* _decodeAssociatorNamesResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     CIMAssociatorNamesResponseMessage* msg;
@@ -1368,7 +1351,6 @@ static void _encodeReferencesResponseBody(
 
 static CIMReferencesResponseMessage* _decodeReferencesResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     CIMReferencesResponseMessage* msg;
@@ -1431,7 +1413,6 @@ static CIMReferenceNamesRequestMessage* _decodeReferenceNamesRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -1495,7 +1476,6 @@ static void _encodeReferenceNamesResponseBody(
 
 static CIMReferenceNamesResponseMessage* _decodeReferenceNamesResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -1629,7 +1609,6 @@ static void _encodeGetClassResponseBody(
 
 static CIMGetClassResponseMessage* _decodeGetClassResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -1755,7 +1734,6 @@ static void _encodeEnumerateClassesResponseBody(
 
 static CIMEnumerateClassesResponseMessage* _decodeEnumerateClassesResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -1874,7 +1852,6 @@ static void _encodeEnumerateClassNamesResponseBody(
 static CIMEnumerateClassNamesResponseMessage*
 _decodeEnumerateClassNamesResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -1934,7 +1911,6 @@ static CIMCreateClassRequestMessage* _decodeCreateClassRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -1969,8 +1945,6 @@ static CIMCreateClassRequestMessage* _decodeCreateClassRequest(
 }
 
 static void _encodeCreateClassResponseBody(
-    CIMBuffer& out,
-    CIMCreateClassResponseMessage* msg,
     CIMName& name)
 {
     /* See ../Server/CIMOperationResponseEncoder.cpp */
@@ -1980,8 +1954,6 @@ static void _encodeCreateClassResponseBody(
 }
 
 static CIMCreateClassResponseMessage* _decodeCreateClassResponse(
-    CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -2028,7 +2000,6 @@ static CIMDeleteClassRequestMessage* _decodeDeleteClassRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -2063,8 +2034,6 @@ static CIMDeleteClassRequestMessage* _decodeDeleteClassRequest(
 }
 
 static void _encodeDeleteClassResponseBody(
-    CIMBuffer& out,
-    CIMDeleteClassResponseMessage* msg,
     CIMName& name)
 {
     /* See ../Server/CIMOperationResponseEncoder.cpp */
@@ -2074,8 +2043,6 @@ static void _encodeDeleteClassResponseBody(
 }
 
 static CIMDeleteClassResponseMessage* _decodeDeleteClassResponse(
-    CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -2122,7 +2089,6 @@ static CIMModifyClassRequestMessage* _decodeModifyClassRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -2157,8 +2123,6 @@ static CIMModifyClassRequestMessage* _decodeModifyClassRequest(
 }
 
 static void _encodeModifyClassResponseBody(
-    CIMBuffer& out,
-    CIMModifyClassResponseMessage* msg,
     CIMName& name)
 {
     /* See ../Server/CIMOperationResponseEncoder.cpp */
@@ -2168,8 +2132,6 @@ static void _encodeModifyClassResponseBody(
 }
 
 static CIMModifyClassResponseMessage* _decodeModifyClassResponse(
-    CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -2216,7 +2178,6 @@ static CIMSetQualifierRequestMessage* _decodeSetQualifierRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -2252,8 +2213,6 @@ static CIMSetQualifierRequestMessage* _decodeSetQualifierRequest(
 }
 
 static void _encodeSetQualifierResponseBody(
-    CIMBuffer& out,
-    CIMSetQualifierResponseMessage* msg,
     CIMName& name)
 {
     /* See ../Server/CIMOperationResponseEncoder.cpp */
@@ -2263,8 +2222,6 @@ static void _encodeSetQualifierResponseBody(
 }
 
 static CIMSetQualifierResponseMessage* _decodeSetQualifierResponse(
-    CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -2311,7 +2268,6 @@ static CIMGetQualifierRequestMessage* _decodeGetQualifierRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -2360,7 +2316,6 @@ static void _encodeGetQualifierResponseBody(
 
 static CIMGetQualifierResponseMessage* _decodeGetQualifierResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -2413,7 +2368,6 @@ static CIMDeleteQualifierRequestMessage* _decodeDeleteQualifierRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -2448,8 +2402,6 @@ static CIMDeleteQualifierRequestMessage* _decodeDeleteQualifierRequest(
 }
 
 static void _encodeDeleteQualifierResponseBody(
-    CIMBuffer& out,
-    CIMDeleteQualifierResponseMessage* msg,
     CIMName& name)
 {
     /* See ../Server/CIMOperationResponseEncoder.cpp */
@@ -2459,8 +2411,6 @@ static void _encodeDeleteQualifierResponseBody(
 }
 
 static CIMDeleteQualifierResponseMessage* _decodeDeleteQualifierResponse(
-    CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -2504,7 +2454,6 @@ static CIMEnumerateQualifiersRequestMessage* _decodeEnumerateQualifiersRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -2547,7 +2496,6 @@ static void _encodeEnumerateQualifiersResponseBody(
 static CIMEnumerateQualifiersResponseMessage*
     _decodeEnumerateQualifiersResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -2610,7 +2558,6 @@ static CIMGetPropertyRequestMessage* _decodeGetPropertyRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -2667,7 +2614,6 @@ static void _encodeGetPropertyResponseBody(
 
 static CIMGetPropertyResponseMessage* _decodeGetPropertyResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -2738,7 +2684,6 @@ static CIMSetPropertyRequestMessage* _decodeSetPropertyRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -2790,8 +2735,6 @@ static CIMSetPropertyRequestMessage* _decodeSetPropertyRequest(
 }
 
 static void _encodeSetPropertyResponseBody(
-    CIMBuffer& out,
-    CIMSetPropertyResponseMessage* msg,
     CIMName& name)
 {
     /* See ../Server/CIMOperationResponseEncoder.cpp */
@@ -2801,8 +2744,6 @@ static void _encodeSetPropertyResponseBody(
 }
 
 static CIMSetPropertyResponseMessage* _decodeSetPropertyResponse(
-    CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -2854,7 +2795,6 @@ static CIMInvokeMethodRequestMessage* _decodeInvokeMethodRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -2926,7 +2866,6 @@ static void _encodeInvokeMethodResponseBody(
 
 static CIMInvokeMethodResponseMessage* _decodeInvokeMethodResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Client/CIMOperationResponseDecoder.cpp */
@@ -3001,7 +2940,6 @@ static CIMExecQueryRequestMessage* _decodeExecQueryRequest(
     CIMBuffer& in,
     Uint32 queueId,
     Uint32 returnQueueId,
-    Uint32 flags,
     const String& messageId)
 {
     /* See ../Server/CIMOperationRequestDecoder.cpp */
@@ -3057,7 +2995,6 @@ static void _encodeExecQueryResponseBody(
 
 static CIMExecQueryResponseMessage* _decodeExecQueryResponse(
     CIMBuffer& in,
-    Uint32 flags,
     const String& messageId)
 {
     CIMExecQueryResponseMessage* msg;
@@ -3172,31 +3109,31 @@ CIMOperationRequestMessage* BinaryCodec::decodeRequest(
                 buf, queueId, returnQueueId, flags, messageId);
         case OP_EnumerateInstanceNames:
             return _decodeEnumerateInstanceNamesRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_GetInstance:
             return _decodeGetInstanceRequest(
                 buf, queueId, returnQueueId, flags, messageId);
         case OP_CreateInstance:
             return _decodeCreateInstanceRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_ModifyInstance:
             return _decodeModifyInstanceRequest(
                 buf, queueId, returnQueueId, flags, messageId);
         case OP_DeleteInstance:
             return _decodeDeleteInstanceRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_Associators:
             return _decodeAssociatorsRequest(
                 buf, queueId, returnQueueId, flags, messageId);
         case OP_AssociatorNames:
             return _decodeAssociatorNamesRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_References:
             return _decodeReferencesRequest(
                 buf, queueId, returnQueueId, flags, messageId);
         case OP_ReferenceNames:
             return _decodeReferenceNamesRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_GetClass:
             return _decodeGetClassRequest(
                 buf, queueId, returnQueueId, flags, messageId);
@@ -3208,37 +3145,37 @@ CIMOperationRequestMessage* BinaryCodec::decodeRequest(
                 buf, queueId, returnQueueId, flags, messageId);
         case OP_CreateClass:
             return _decodeCreateClassRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_DeleteClass:
             return _decodeDeleteClassRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_ModifyClass:
             return _decodeModifyClassRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_SetQualifier:
             return _decodeSetQualifierRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_GetQualifier:
             return _decodeGetQualifierRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_DeleteQualifier:
             return _decodeDeleteQualifierRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_EnumerateQualifiers:
             return _decodeEnumerateQualifiersRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_GetProperty:
            return _decodeGetPropertyRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_SetProperty:
            return _decodeSetPropertyRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_InvokeMethod:
            return _decodeInvokeMethodRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         case OP_ExecQuery:
            return _decodeExecQueryRequest(
-                buf, queueId, returnQueueId, flags, messageId);
+                buf, queueId, returnQueueId, messageId);
         default:
             // Unexpected message type
             PEGASUS_ASSERT(0);
@@ -3284,76 +3221,76 @@ CIMResponseMessage* BinaryCodec::decodeResponse(
     switch (operation)
     {
         case OP_EnumerateInstances:
-            msg = _decodeEnumerateInstancesResponse(buf, flags, messageId);
+            msg = _decodeEnumerateInstancesResponse(buf, messageId);
             break;
         case OP_EnumerateInstanceNames:
-            msg = _decodeEnumerateInstanceNamesResponse(buf, flags, messageId);
+            msg = _decodeEnumerateInstanceNamesResponse(buf, messageId);
             break;
         case OP_GetInstance:
-            msg = _decodeGetInstanceResponse(buf, flags, messageId);
+            msg = _decodeGetInstanceResponse(buf, messageId);
             break;
         case OP_CreateInstance:
-            msg = _decodeCreateInstanceResponse(buf, flags, messageId);
+            msg = _decodeCreateInstanceResponse(buf, messageId);
             break;
         case OP_ModifyInstance:
-            msg = _decodeModifyInstanceResponse(buf, flags, messageId);
+            msg = _decodeModifyInstanceResponse(buf, messageId);
             break;
         case OP_DeleteInstance:
-            msg = _decodeDeleteInstanceResponse(buf, flags, messageId);
+            msg = _decodeDeleteInstanceResponse(messageId);
             break;
         case OP_Associators:
-            msg = _decodeAssociatorsResponse(buf, flags, messageId);
+            msg = _decodeAssociatorsResponse(buf, messageId);
             break;
         case OP_AssociatorNames:
-            msg = _decodeAssociatorNamesResponse(buf, flags, messageId);
+            msg = _decodeAssociatorNamesResponse(buf, messageId);
             break;
         case OP_References:
-            msg = _decodeReferencesResponse(buf, flags, messageId);
+            msg = _decodeReferencesResponse(buf, messageId);
             break;
         case OP_ReferenceNames:
-            msg = _decodeReferenceNamesResponse(buf, flags, messageId);
+            msg = _decodeReferenceNamesResponse(buf, messageId);
             break;
         case OP_GetClass:
-            msg = _decodeGetClassResponse(buf, flags, messageId);
+            msg = _decodeGetClassResponse(buf, messageId);
             break;
         case OP_EnumerateClasses:
-            msg = _decodeEnumerateClassesResponse(buf, flags, messageId);
+            msg = _decodeEnumerateClassesResponse(buf, messageId);
             break;
         case OP_EnumerateClassNames:
-            msg = _decodeEnumerateClassNamesResponse(buf, flags, messageId);
+            msg = _decodeEnumerateClassNamesResponse(buf, messageId);
             break;
         case OP_CreateClass:
-            msg = _decodeCreateClassResponse(buf, flags, messageId);
+            msg = _decodeCreateClassResponse(messageId);
             break;
         case OP_DeleteClass:
-            msg = _decodeDeleteClassResponse(buf, flags, messageId);
+            msg = _decodeDeleteClassResponse(messageId);
             break;
         case OP_ModifyClass:
-            msg = _decodeModifyClassResponse(buf, flags, messageId);
+            msg = _decodeModifyClassResponse(messageId);
             break;
         case OP_SetQualifier:
-            msg = _decodeSetQualifierResponse(buf, flags, messageId);
+            msg = _decodeSetQualifierResponse(messageId);
             break;
         case OP_GetQualifier:
-            msg = _decodeGetQualifierResponse(buf, flags, messageId);
+            msg = _decodeGetQualifierResponse(buf, messageId);
             break;
         case OP_DeleteQualifier:
-            msg = _decodeDeleteQualifierResponse(buf, flags, messageId);
+            msg = _decodeDeleteQualifierResponse(messageId);
             break;
         case OP_EnumerateQualifiers:
-            msg = _decodeEnumerateQualifiersResponse(buf, flags, messageId);
+            msg = _decodeEnumerateQualifiersResponse(buf, messageId);
             break;
         case OP_GetProperty:
-            msg = _decodeGetPropertyResponse(buf, flags, messageId);
+            msg = _decodeGetPropertyResponse(buf, messageId);
             break;
         case OP_SetProperty:
-            msg = _decodeSetPropertyResponse(buf, flags, messageId);
+            msg = _decodeSetPropertyResponse(messageId);
             break;
         case OP_InvokeMethod:
-            msg = _decodeInvokeMethodResponse(buf, flags, messageId);
+            msg = _decodeInvokeMethodResponse(buf, messageId);
             break;
         case OP_ExecQuery:
-            msg = _decodeExecQueryResponse(buf, flags, messageId);
+            msg = _decodeExecQueryResponse(buf, messageId);
             break;
         default:
             // Unexpected message type
@@ -3669,15 +3606,13 @@ bool BinaryCodec::encodeResponseBody(
 
         case CIM_MODIFY_INSTANCE_RESPONSE_MESSAGE:
         {
-            _encodeModifyInstanceResponseBody(buf,
-                (CIMModifyInstanceResponseMessage*)msg, name);
+            _encodeModifyInstanceResponseBody(name);
             break;
         }
 
         case CIM_DELETE_INSTANCE_RESPONSE_MESSAGE:
         {
-            _encodeDeleteInstanceResponseBody(buf,
-                (CIMDeleteInstanceResponseMessage*)msg, name);
+            _encodeDeleteInstanceResponseBody(name);
             break;
         }
 
@@ -3740,29 +3675,25 @@ bool BinaryCodec::encodeResponseBody(
 
         case CIM_CREATE_CLASS_RESPONSE_MESSAGE:
         {
-            _encodeCreateClassResponseBody(buf,
-                (CIMCreateClassResponseMessage*)msg, name);
+            _encodeCreateClassResponseBody(name);
             break;
         }
 
         case CIM_DELETE_CLASS_RESPONSE_MESSAGE:
         {
-            _encodeDeleteClassResponseBody(buf,
-                (CIMDeleteClassResponseMessage*)msg, name);
+            _encodeDeleteClassResponseBody(name);
             break;
         }
 
         case CIM_MODIFY_CLASS_RESPONSE_MESSAGE:
         {
-            _encodeModifyClassResponseBody(buf,
-                (CIMModifyClassResponseMessage*)msg, name);
+            _encodeModifyClassResponseBody(name);
             break;
         }
 
         case CIM_SET_QUALIFIER_RESPONSE_MESSAGE:
         {
-            _encodeSetQualifierResponseBody(buf,
-                (CIMSetQualifierResponseMessage*)msg, name);
+            _encodeSetQualifierResponseBody(name);
             break;
         }
 
@@ -3775,8 +3706,7 @@ bool BinaryCodec::encodeResponseBody(
 
         case CIM_DELETE_QUALIFIER_RESPONSE_MESSAGE:
         {
-            _encodeDeleteQualifierResponseBody(buf,
-                (CIMDeleteQualifierResponseMessage*)msg, name);
+            _encodeDeleteQualifierResponseBody(name);
             break;
         }
 
@@ -3796,8 +3726,7 @@ bool BinaryCodec::encodeResponseBody(
 
         case CIM_SET_PROPERTY_RESPONSE_MESSAGE:
         {
-            _encodeSetPropertyResponseBody(buf,
-                (CIMSetPropertyResponseMessage*)msg, name);
+            _encodeSetPropertyResponseBody(name);
             break;
         }
 

diff --git a/src/Pegasus/Common/CIMBinMsgSerializer.cpp b/src/Pegasus/Common/CIMBinMsgSerializer.cpp
index 3a859e97d5aaaff858645f0832f97ffa34916f48..fb8b040986d8eed81c0401df32335250a2195e68 100644 (file)
--- a/src/Pegasus/Common/CIMBinMsgSerializer.cpp
+++ b/src/Pegasus/Common/CIMBinMsgSerializer.cpp
@@ -151,8 +151,7 @@ void CIMBinMsgSerializer::_putRequestMessage(
                     out, (CIMEnumerateInstancesRequestMessage*)msg);
                 break;
             case CIM_ENUMERATE_INSTANCE_NAMES_REQUEST_MESSAGE:
-                _putEnumerateInstanceNamesRequestMessage(
-                    out, (CIMEnumerateInstanceNamesRequestMessage*)msg);
+                // not implemented
                 break;
             case CIM_EXEC_QUERY_REQUEST_MESSAGE:
                 _putExecQueryRequestMessage(
@@ -253,8 +252,7 @@ void CIMBinMsgSerializer::_putRequestMessage(
                 out, (CIMEnableModuleRequestMessage*)msg);
             break;
         case CIM_STOP_ALL_PROVIDERS_REQUEST_MESSAGE:
-            _putStopAllProvidersRequestMessage(
-                out, (CIMStopAllProvidersRequestMessage*)msg);
+            // not implemented
             break;
         case CIM_INITIALIZE_PROVIDER_AGENT_REQUEST_MESSAGE:
             _putInitializeProviderAgentRequestMessage(
@@ -267,13 +265,11 @@ void CIMBinMsgSerializer::_putRequestMessage(
             break;
 
         case CIM_SUBSCRIPTION_INIT_COMPLETE_REQUEST_MESSAGE:
-            _putSubscriptionInitCompleteRequestMessage(
-                out, (CIMSubscriptionInitCompleteRequestMessage*)msg);
+            // not implemented
             break;
 
         case CIM_INDICATION_SERVICE_DISABLED_REQUEST_MESSAGE:
-            _putIndicationServiceDisabledRequestMessage(
-                out, (CIMIndicationServiceDisabledRequestMessage*)msg);
+            // not implemented
             break;
         case PROVAGT_GET_SCMOCLASS_REQUEST_MESSAGE:
             _putProvAgtGetScmoClassRequestMessage(
@@ -309,16 +305,14 @@ void CIMBinMsgSerializer::_putResponseMessage(
                 out, (CIMGetInstanceResponseMessage*)cimMessage);
             break;
         case CIM_DELETE_INSTANCE_RESPONSE_MESSAGE:
-            _putDeleteInstanceResponseMessage(
-                out, (CIMDeleteInstanceResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_CREATE_INSTANCE_RESPONSE_MESSAGE:
             _putCreateInstanceResponseMessage(
                 out, (CIMCreateInstanceResponseMessage*)cimMessage);
             break;
         case CIM_MODIFY_INSTANCE_RESPONSE_MESSAGE:
-            _putModifyInstanceResponseMessage(
-                out, (CIMModifyInstanceResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_ENUMERATE_INSTANCES_RESPONSE_MESSAGE:
             _putEnumerateInstancesResponseMessage(
@@ -337,8 +331,7 @@ void CIMBinMsgSerializer::_putResponseMessage(
                 out, (CIMGetPropertyResponseMessage*)cimMessage);
             break;
         case CIM_SET_PROPERTY_RESPONSE_MESSAGE:
-            _putSetPropertyResponseMessage(
-                out, (CIMSetPropertyResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_ASSOCIATORS_RESPONSE_MESSAGE:
             _putAssociatorsResponseMessage(
@@ -361,24 +354,19 @@ void CIMBinMsgSerializer::_putResponseMessage(
                 out, (CIMInvokeMethodResponseMessage*)cimMessage);
             break;
         case CIM_CREATE_SUBSCRIPTION_RESPONSE_MESSAGE:
-            _putCreateSubscriptionResponseMessage(
-                out, (CIMCreateSubscriptionResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_MODIFY_SUBSCRIPTION_RESPONSE_MESSAGE:
-            _putModifySubscriptionResponseMessage(
-                out, (CIMModifySubscriptionResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_DELETE_SUBSCRIPTION_RESPONSE_MESSAGE:
-            _putDeleteSubscriptionResponseMessage(
-                out, (CIMDeleteSubscriptionResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_EXPORT_INDICATION_RESPONSE_MESSAGE:
-            _putExportIndicationResponseMessage(
-                out, (CIMExportIndicationResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_PROCESS_INDICATION_RESPONSE_MESSAGE:
-            _putProcessIndicationResponseMessage(
-                out, (CIMProcessIndicationResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_DISABLE_MODULE_RESPONSE_MESSAGE:
             _putDisableModuleResponseMessage(
@@ -389,28 +377,19 @@ void CIMBinMsgSerializer::_putResponseMessage(
                 out, (CIMEnableModuleResponseMessage*)cimMessage);
             break;
         case CIM_STOP_ALL_PROVIDERS_RESPONSE_MESSAGE:
-            _putStopAllProvidersResponseMessage(
-                out, (CIMStopAllProvidersResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_INITIALIZE_PROVIDER_AGENT_RESPONSE_MESSAGE:
-            _putInitializeProviderAgentResponseMessage(
-                out, (CIMInitializeProviderAgentResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_NOTIFY_CONFIG_CHANGE_RESPONSE_MESSAGE:
-            _putNotifyConfigChangeResponseMessage(
-                out, (CIMNotifyConfigChangeResponseMessage*)cimMessage);
+            // not implemented
             break;
         case CIM_SUBSCRIPTION_INIT_COMPLETE_RESPONSE_MESSAGE:
-            _putSubscriptionInitCompleteResponseMessage(
-                out,
-                (CIMSubscriptionInitCompleteResponseMessage *)
-                cimMessage);
+            // not implemented
             break;
         case CIM_INDICATION_SERVICE_DISABLED_RESPONSE_MESSAGE:
-            _putIndicationServiceDisabledResponseMessage(
-                out,
-                (CIMIndicationServiceDisabledResponseMessage *)
-                cimMessage);
+            // not implemented
             break;
         case PROVAGT_GET_SCMOCLASS_RESPONSE_MESSAGE:
             _putProvAgtGetScmoClassResponseMessage(
@@ -759,12 +738,6 @@ void CIMBinMsgSerializer::_putEnumerateInstancesRequestMessage(
     _putPropertyList(out, msg->propertyList);
 }
 
-void CIMBinMsgSerializer::_putEnumerateInstanceNamesRequestMessage(
-    CIMBuffer& out,
-    CIMEnumerateInstanceNamesRequestMessage* msg)
-{
-}
-
 void CIMBinMsgSerializer::_putExecQueryRequestMessage(
     CIMBuffer& out,
     CIMExecQueryRequestMessage* msg)
@@ -917,12 +890,6 @@ void CIMBinMsgSerializer::_putEnableModuleRequestMessage(
     _putInstance(out, msg->providerModule);
 }
 
-void CIMBinMsgSerializer::_putStopAllProvidersRequestMessage(
-    CIMBuffer& out,
-    CIMStopAllProvidersRequestMessage* msg)
-{
-}
-
 void CIMBinMsgSerializer::_putInitializeProviderAgentRequestMessage(
     CIMBuffer& out,
     CIMInitializeProviderAgentRequestMessage* msg)
@@ -949,18 +916,6 @@ void CIMBinMsgSerializer::_putNotifyConfigChangeRequestMessage(
     out.putBoolean(msg->currentValueModified);
 }
 
-void CIMBinMsgSerializer::_putSubscriptionInitCompleteRequestMessage(
-    CIMBuffer& out,
-    CIMSubscriptionInitCompleteRequestMessage* msg)
-{
-}
-
-void CIMBinMsgSerializer::_putIndicationServiceDisabledRequestMessage(
-    CIMBuffer& out,
-    CIMIndicationServiceDisabledRequestMessage* msg)
-{
-}
-
 void CIMBinMsgSerializer::_putProvAgtGetScmoClassRequestMessage(
     CIMBuffer& out,
     ProvAgtGetScmoClassRequestMessage* msg)
@@ -987,12 +942,6 @@ void CIMBinMsgSerializer::_putGetInstanceResponseMessage(
     }
 }
 
-void CIMBinMsgSerializer::_putDeleteInstanceResponseMessage(
-    CIMBuffer& out,
-    CIMDeleteInstanceResponseMessage* msg)
-{
-}
-
 void CIMBinMsgSerializer::_putCreateInstanceResponseMessage(
     CIMBuffer& out,
     CIMCreateInstanceResponseMessage* msg)
@@ -1000,12 +949,6 @@ void CIMBinMsgSerializer::_putCreateInstanceResponseMessage(
     _putObjectPath(out, msg->instanceName);
 }
 
-void CIMBinMsgSerializer::_putModifyInstanceResponseMessage(
-    CIMBuffer& out,
-    CIMModifyInstanceResponseMessage* msg)
-{
-}
-
 void CIMBinMsgSerializer::_putEnumerateInstancesResponseMessage(
     CIMBuffer& out,
     CIMEnumerateInstancesResponseMessage* msg)
@@ -1105,12 +1048,6 @@ void CIMBinMsgSerializer::_putGetPropertyResponseMessage(
         msg->value, true));
 }
 
-void CIMBinMsgSerializer::_putSetPropertyResponseMessage(
-    CIMBuffer& out,
-    CIMSetPropertyResponseMessage* msg)
-{
-}
-
 void CIMBinMsgSerializer::_putInvokeMethodResponseMessage(
     CIMBuffer& out,
     CIMInvokeMethodResponseMessage* msg)
@@ -1121,36 +1058,6 @@ void CIMBinMsgSerializer::_putInvokeMethodResponseMessage(
     _putName(out, msg->methodName);
 }
 
-void CIMBinMsgSerializer::_putCreateSubscriptionResponseMessage(
-    CIMBuffer& out,
-    CIMCreateSubscriptionResponseMessage* msg)
-{
-}
-
-void CIMBinMsgSerializer::_putModifySubscriptionResponseMessage(
-    CIMBuffer& out,
-    CIMModifySubscriptionResponseMessage* msg)
-{
-}
-
-void CIMBinMsgSerializer::_putDeleteSubscriptionResponseMessage(
-    CIMBuffer& out,
-    CIMDeleteSubscriptionResponseMessage* msg)
-{
-}
-
-void CIMBinMsgSerializer::_putExportIndicationResponseMessage(
-    CIMBuffer& out,
-    CIMExportIndicationResponseMessage* msg)
-{
-}
-
-void CIMBinMsgSerializer::_putProcessIndicationResponseMessage(
-    CIMBuffer& out,
-    CIMProcessIndicationResponseMessage* msg)
-{
-}
-
 void CIMBinMsgSerializer::_putDisableModuleResponseMessage(
     CIMBuffer& out,
     CIMDisableModuleResponseMessage* msg)
@@ -1165,36 +1072,6 @@ void CIMBinMsgSerializer::_putEnableModuleResponseMessage(
     out.putUint16A(msg->operationalStatus);
 }
 
-void CIMBinMsgSerializer::_putStopAllProvidersResponseMessage(
-    CIMBuffer& out,
-    CIMStopAllProvidersResponseMessage* msg)
-{
-}
-
-void CIMBinMsgSerializer::_putInitializeProviderAgentResponseMessage(
-    CIMBuffer& out,
-    CIMInitializeProviderAgentResponseMessage* msg)
-{
-}
-
-void CIMBinMsgSerializer::_putNotifyConfigChangeResponseMessage(
-    CIMBuffer& out,
-    CIMNotifyConfigChangeResponseMessage* msg)
-{
-}
-
-void CIMBinMsgSerializer::_putSubscriptionInitCompleteResponseMessage(
-    CIMBuffer& out,
-    CIMSubscriptionInitCompleteResponseMessage* msg)
-{
-}
-
-void CIMBinMsgSerializer::_putIndicationServiceDisabledResponseMessage(
-    CIMBuffer& out,
-    CIMIndicationServiceDisabledResponseMessage* msg)
-{
-}
-
 void CIMBinMsgSerializer::_putProvAgtGetScmoClassResponseMessage(
     CIMBuffer& out,
     ProvAgtGetScmoClassResponseMessage* msg)

diff --git a/src/Pegasus/Common/CIMBinMsgSerializer.h b/src/Pegasus/Common/CIMBinMsgSerializer.h
index d723c49fc2641209101564da3fa06657ee8e28f4..702e9e81434051876d5f53e4a91419a2d9b0258f 100644 (file)
--- a/src/Pegasus/Common/CIMBinMsgSerializer.h
+++ b/src/Pegasus/Common/CIMBinMsgSerializer.h
@@ -151,11 +151,6 @@ private:
         CIMBuffer& out,
         CIMEnumerateInstancesRequestMessage* msg);
 
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putEnumerateInstanceNamesRequestMessage(
-        CIMBuffer& out,
-        CIMEnumerateInstanceNamesRequestMessage* msg);
-
     PEGASUS_HIDDEN_LINKAGE
     static void _putExecQueryRequestMessage(
         CIMBuffer& out,
@@ -231,11 +226,6 @@ private:
         CIMBuffer& out,
         CIMEnableModuleRequestMessage* msg);
 
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putStopAllProvidersRequestMessage(
-        CIMBuffer& out,
-        CIMStopAllProvidersRequestMessage* msg);
-
     PEGASUS_HIDDEN_LINKAGE
     static void _putInitializeProviderAgentRequestMessage(
         CIMBuffer& out,
@@ -246,16 +236,6 @@ private:
         CIMBuffer& out,
         CIMNotifyConfigChangeRequestMessage* msg);
 
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putSubscriptionInitCompleteRequestMessage(
-        CIMBuffer& out,
-        CIMSubscriptionInitCompleteRequestMessage* msg);
-
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putIndicationServiceDisabledRequestMessage(
-        CIMBuffer& out,
-        CIMIndicationServiceDisabledRequestMessage* msg);
-
     PEGASUS_HIDDEN_LINKAGE
     static void _putProvAgtGetScmoClassRequestMessage(
         CIMBuffer& out,
@@ -266,21 +246,11 @@ private:
         CIMBuffer& out,
         CIMGetInstanceResponseMessage* msg);
 
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putDeleteInstanceResponseMessage(
-        CIMBuffer& out,
-        CIMDeleteInstanceResponseMessage* msg);
-
     PEGASUS_HIDDEN_LINKAGE
     static void _putCreateInstanceResponseMessage(
         CIMBuffer& out,
         CIMCreateInstanceResponseMessage* msg);
 
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putModifyInstanceResponseMessage(
-        CIMBuffer& out,
-        CIMModifyInstanceResponseMessage* msg);
-
     PEGASUS_HIDDEN_LINKAGE
     static void _putEnumerateInstancesResponseMessage(
         CIMBuffer& out,
@@ -321,41 +291,11 @@ private:
         CIMBuffer& out,
         CIMGetPropertyResponseMessage* msg);
 
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putSetPropertyResponseMessage(
-        CIMBuffer& out,
-        CIMSetPropertyResponseMessage* msg);
-
     PEGASUS_HIDDEN_LINKAGE
     static void _putInvokeMethodResponseMessage(
         CIMBuffer& out,
         CIMInvokeMethodResponseMessage* msg);
 
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putCreateSubscriptionResponseMessage(
-        CIMBuffer& out,
-        CIMCreateSubscriptionResponseMessage* msg);
-
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putModifySubscriptionResponseMessage(
-        CIMBuffer& out,
-        CIMModifySubscriptionResponseMessage* msg);
-
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putDeleteSubscriptionResponseMessage(
-        CIMBuffer& out,
-        CIMDeleteSubscriptionResponseMessage* msg);
-
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putExportIndicationResponseMessage(
-        CIMBuffer& out,
-        CIMExportIndicationResponseMessage* msg);
-
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putProcessIndicationResponseMessage(
-        CIMBuffer& out,
-        CIMProcessIndicationResponseMessage* msg);
-
     PEGASUS_HIDDEN_LINKAGE
     static void _putDisableModuleResponseMessage(
         CIMBuffer& out,
@@ -366,31 +306,6 @@ private:
         CIMBuffer& out,
         CIMEnableModuleResponseMessage* msg);
 
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putStopAllProvidersResponseMessage(
-        CIMBuffer& out,
-        CIMStopAllProvidersResponseMessage* msg);
-
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putInitializeProviderAgentResponseMessage(
-        CIMBuffer& out,
-        CIMInitializeProviderAgentResponseMessage* msg);
-
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putNotifyConfigChangeResponseMessage(
-        CIMBuffer& out,
-        CIMNotifyConfigChangeResponseMessage* msg);
-
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putSubscriptionInitCompleteResponseMessage(
-        CIMBuffer& out,
-        CIMSubscriptionInitCompleteResponseMessage* msg);
-
-    PEGASUS_HIDDEN_LINKAGE
-    static void _putIndicationServiceDisabledResponseMessage(
-        CIMBuffer& out,
-        CIMIndicationServiceDisabledResponseMessage* msg);
-
     PEGASUS_HIDDEN_LINKAGE
     static void _putProvAgtGetScmoClassResponseMessage(
         CIMBuffer& out,

diff --git a/src/Pegasus/Common/MessageLoader.cpp b/src/Pegasus/Common/MessageLoader.cpp
index bb6f72749e805cf70eb8d12ab4beb7ac87c6ea66..f80d3e89289d88f2d890dbc2f91a20204a792817 100755 (executable)
--- a/src/Pegasus/Common/MessageLoader.cpp
+++ b/src/Pegasus/Common/MessageLoader.cpp
@@ -638,7 +638,7 @@ void MessageLoader::setPegasusMsgHomeRelative(const String& argv0)
                 if (env != NULL)
                     path.assign(env);
                 String pathDelim = FileSystem::getPathDelimiter();
-                Uint32 size = path.size();
+                
                 while (path.size() > 0)
                 {
                     try

diff --git a/src/Pegasus/Common/SCMO.cpp b/src/Pegasus/Common/SCMO.cpp
index 51cb7e60ae3fbc7f993e00ba0889b310de4a7fc8..ba0afd1879a37e2b827026e97729f45be04651c8 100644 (file)
--- a/src/Pegasus/Common/SCMO.cpp
+++ b/src/Pegasus/Common/SCMO.cpp
@@ -168,6 +168,29 @@ const StrLit SCMOClass::_qualifierNameStrLit[72] =
 #define _NUM_QUALIFIER_NAMES \
            (sizeof(_qualifierNameStrLit)/sizeof(_qualifierNameStrLit[0]))
 
+
+/*****************************************************************************
+ * The static declaration of the common SCMO memory functions.
+ *****************************************************************************/
+
+static Uint64 _getFreeSpace(
+    SCMBDataPtr& ptr,
+    Uint32 size,
+    SCMBMgmt_Header** pmem);
+
+static void _setString(
+    const String& theString,
+    SCMBDataPtr& ptr,
+    SCMBMgmt_Header** pmem);
+
+static void _setBinary(
+    const void* theBuffer,
+    Uint32 bufferSize,
+    SCMBDataPtr& ptr,
+    SCMBMgmt_Header** pmem);
+
+
+
 /*****************************************************************************
  * Internal inline functions.
  *****************************************************************************/
@@ -1591,9 +1614,6 @@ SCMO_RC SCMOInstance::getCIMInstance(CIMInstance& cimInstance) const
          {
              for(Uint32 i = 0, k = inst.hdr->numberProperties; i<k; i++)
              {
-                 SCMBValue* theInstPropArray =
-                     (SCMBValue*)&(inst.base[inst.hdr->propertyArray.start]);
-
                  // Set all properties in the CIMInstance gegarding they
                  // are part of the SCMOInstance or the SCMOClass.
                  CIMProperty theProperty=_getCIMPropertyAtNodeIndex(i);
@@ -5529,7 +5549,6 @@ void SCMODump::dumpSCMOInstance(SCMOInstance& testInst, Boolean inclMemHdr)const
 void SCMODump::dumpSCMOInstancePropertyFilter(SCMOInstance& testInst) const
 {
     SCMBInstance_Main* insthdr = testInst.inst.hdr;
-    char* instbase = testInst.inst.base;
 
     if (!insthdr->flags.isFiltered)
     {
@@ -5916,7 +5935,6 @@ void SCMODump::dumpKeyIndexList(SCMOClass& testCls) const
 void SCMODump::dumpKeyBindingSet(SCMOClass& testCls) const
 {
     SCMBClass_Main* clshdr = testCls.cls.hdr;
-    char* clsbase = testCls.cls.base;
 
     fprintf(_out,"\n\nKey Binding Set:");
     fprintf(_out,"\n=================\n");
@@ -5970,7 +5988,6 @@ void SCMODump::dumpClassKeyBindingNodeArray(SCMOClass& testCls) const
 void SCMODump::dumpClassProperties(SCMOClass& testCls) const
 {
     SCMBClass_Main* clshdr = testCls.cls.hdr;
-    char* clsbase = testCls.cls.base;
 
     fprintf(_out,"\n\nClass Properties:");
     fprintf(_out,"\n=================\n");

diff --git a/src/Pegasus/Common/SCMO.h b/src/Pegasus/Common/SCMO.h
index c7609c618769fa1321b12205092906f940c6ba25..74975749435004cf52112b38843666b7376ed2f5 100644 (file)
--- a/src/Pegasus/Common/SCMO.h
+++ b/src/Pegasus/Common/SCMO.h
@@ -544,23 +544,6 @@ inline Uint32 _generateSCMOStringTag(
     return _generateStringTag(_getCharString(ptr,base),ptr.size-1);
 }
 
-// The static declaration of the common SCMO memory functions
-static Uint64 _getFreeSpace(
-    SCMBDataPtr& ptr,
-    Uint32 size,
-    SCMBMgmt_Header** pmem);
-
-static void _setString(
-    const String& theString,
-    SCMBDataPtr& ptr,
-    SCMBMgmt_Header** pmem);
-
-static void _setBinary(
-    const void* theBuffer,
-    Uint32 bufferSize,
-    SCMBDataPtr& ptr,
-    SCMBMgmt_Header** pmem);
-
 PEGASUS_COMMON_LINKAGE extern void _destroyExternalReferencesInternal(
     SCMBMgmt_Header* memHdr);
 

diff --git a/src/Pegasus/Common/XmlParser.h b/src/Pegasus/Common/XmlParser.h
index 4d1e1d67cd8a7ce56d66026a32541c36050e31a4..d54053888666ae6298e40958068afa548e5ce25e 100644 (file)
--- a/src/Pegasus/Common/XmlParser.h
+++ b/src/Pegasus/Common/XmlParser.h
@@ -190,7 +190,7 @@ public:
 
     void setHideEmptyTags(bool flag) { _hideEmptyTags = flag; }
 
-    bool getHideEmptyTags(bool flag) const { return _hideEmptyTags; }
+    bool getHideEmptyTags() const { return _hideEmptyTags; }
 
 private: