(file) Return to CMPI_Value.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ProviderManager2 / CMPI

Diff for /pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_Value.cpp between version 1.11 and 1.12

version 1.11, 2004/06/16 12:45:56 version 1.12, 2004/06/28 23:51:56
Line 45 
Line 45 
    for (int i=0; i<aSize; i++) ar##pt[i]=String(((char*)aData[i].value.ct)); \    for (int i=0; i<aSize; i++) ar##pt[i]=String(((char*)aData[i].value.ct)); \
    v.set(ar##pt); }    v.set(ar##pt); }
  
   #define CopyCharsptrToStringArray(pt,ct) { Array<pt> ar##pt(aSize); \
      for (int i=0; i<aSize; i++) ar##pt[i]=String((*(char**)aData[i].value.ct)); \
      v.set(ar##pt); }
   
 #define CopyToEncArray(pt,ct) { Array<pt> ar##pt(aSize); \ #define CopyToEncArray(pt,ct) { Array<pt> ar##pt(aSize); \
    for (int i=0; i<aSize; i++) ar##pt[i]=*((pt*)aData[i].value.ct->hdl); \    for (int i=0; i<aSize; i++) ar##pt[i]=*((pt*)aData[i].value.ct->hdl); \
    v.set(ar##pt); }    v.set(ar##pt); }
Line 86 
Line 90 
       }       }
  
       else if (aType==CMPI_chars)  CopyToStringArray(String,chars)       else if (aType==CMPI_chars)  CopyToStringArray(String,chars)
         else if (aType==CMPI_charsptr)    CopyCharsptrToStringArray(String,chars)
       else if (aType==CMPI_string) CopyToStringArray(String,string->hdl)       else if (aType==CMPI_string) CopyToStringArray(String,string->hdl)
  
       else if ((aType & (CMPI_UINT|CMPI_SINT))==CMPI_UINT) {       else if ((aType & (CMPI_UINT|CMPI_SINT))==CMPI_UINT) {
Line 117 
Line 122 
       if (data) v.set(String((char*)data));       if (data) v.set(String((char*)data));
       else return CIMValue(CIMTYPE_STRING,false);       else return CIMValue(CIMTYPE_STRING,false);
    }    }
      else if (type==CMPI_charsptr) {
         if (data && *(char**)data) v.set(String(*(char**)data));
         else return CIMValue(CIMTYPE_STRING,false);
      }
  
    else if (type & CMPI_ENC &&    else if (type & CMPI_ENC &&
       (data==NULL || data->string==NULL || data->string->hdl==NULL)) {       (data==NULL || data->string==NULL || data->string->hdl==NULL)) {


Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2