sblim-commit

[Tyrel D. <ty...@us...>]

Update of /cvsroot/sblim/cmpi-devel
In directory vz-cvs-3.sog:/tmp/cvs-serv2044

Modified Files:
	CmpiImpl.cpp NEWS 
Log Message:
Fixed 3531599: replace CMGetCharPtr with CMGetCharsPtr


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/NEWS,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- NEWS	3 Jun 2012 05:29:32 -0000	1.21
+++ NEWS	3 Jun 2012 05:35:38 -0000	1.22
@@ -3,6 +3,7 @@
 
 Bugs Fixed:
 - 3531598 several CmpiObjectPath methods leak memory
+- 3531599 replace CMGetCharPtr with CMGetCharsPtr
 
 New Features:
 - 3531601 add CmpiString constructor for char data

Index: CmpiImpl.cpp
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/CmpiImpl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CmpiImpl.cpp	3 Jun 2012 05:29:32 -0000	1.13
+++ CmpiImpl.cpp	3 Jun 2012 05:35:38 -0000	1.14
@@ -1188,7 +1188,7 @@
 }
 
 const char*  CmpiStatus::msg() {
-   return st.msg ? CMGetCharPtr(st.msg) : 0;
+   return st.msg ? CMGetCharsPtr(st.msg,NULL) : 0;
 }
 
 CmpiStatus::CmpiStatus() {
@@ -1252,7 +1252,7 @@
 
 void *CmpiObjectPath::makeObjectPath(CMPIBroker *mb, const CmpiString& ns, const char *cls) {
    CMPIStatus rc={CMPI_RC_OK,NULL};
-   void *op=mb->eft->newObjectPath(mb,CMGetCharPtr(ns.getEnc()),cls,&rc);
+   void *op=mb->eft->newObjectPath(mb,CMGetCharsPtr(ns.getEnc(),NULL),cls,&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
    return op;
 }