[Sblim-commit] cmpi-tests/cmpi-instancetest/src TST_InstanceTest.c,1.3,1.4 cmpiutil.c,1.2,1.3

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19713/src

Modified Files:
	TST_InstanceTest.c cmpiutil.c 
Log Message:
fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1197062&group_id=128809&atid=712784


Index: TST_InstanceTest.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src/TST_InstanceTest.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TST_InstanceTest.c	13 May 2005 22:55:50 -0000	1.3
+++ TST_InstanceTest.c	18 May 2005 15:47:56 -0000	1.4
@@ -404,13 +404,13 @@
    }
 
    else if (strcmp(namestring, "Property_uint32") == 0) {
-      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%u, data value=%u", _PROVIDERNAME,
+      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%lu, data value=%lu", _PROVIDERNAME,
 		value.uint32, instancedata->Property_uint32));
       if (value.uint32 != instancedata->Property_uint32) goto error;
    }
 
    else if (strcmp(namestring, "Property_uint64") == 0) {
-      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%u, data value=%u", _PROVIDERNAME,
+      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%llu, data value=%llu", _PROVIDERNAME,
 		value.uint64, instancedata->Property_uint64));
       if (value.uint64 != instancedata->Property_uint64) goto error;
    }
@@ -428,13 +428,13 @@
    }
 
    else if (strcmp(namestring, "Property_sint32") == 0) {
-      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%d, data value=%d", _PROVIDERNAME,
+      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%ld, data value=%ld", _PROVIDERNAME,
 		value.sint32, instancedata->Property_sint32));
       if (value.sint32 != instancedata->Property_sint32) goto error;
    }
 
    else if (strcmp(namestring, "Property_sint64") == 0) {
-      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%d, data value=%d", _PROVIDERNAME,
+      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%lld, data value=%lld", _PROVIDERNAME,
 		value.sint64, instancedata->Property_sint64));
       if (value.sint64 != instancedata->Property_sint64) goto error;
    }
@@ -452,7 +452,7 @@
    }
 
    else if (strcmp(namestring, "Property_real64") == 0) {
-      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%.32e, data value=%.32e", _PROVIDERNAME,
+      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%.32le, data value=%.32le", _PROVIDERNAME,
 		value.real64, instancedata->Property_real64));
       if (value.real64 != instancedata->Property_real64) goto error;
    }
@@ -496,9 +496,9 @@
       }
 
       /* Compare dateTime's using their binary format */
-     _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%d, data value=%d", _PROVIDERNAME,
+     _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%lld, data value=%lld", _PROVIDERNAME,
 		datetime1, datetime2));
-//      if (datetime1 != datetime2) goto error;
+      if (datetime1 != datetime2) goto error;
    }
 
    else if (strcmp(namestring, "Property_char16") == 0) {

Index: cmpiutil.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src/cmpiutil.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmpiutil.c	12 May 2005 00:53:19 -0000	1.2
+++ cmpiutil.c	18 May 2005 15:47:56 -0000	1.3
@@ -307,19 +307,19 @@
          return valuestring;
       case CMPI_sint32:
          valuestring = malloc(100*sizeof(char));
-         sprintf(valuestring, "%d", data.value.sint32);
+         sprintf(valuestring, "%ld", data.value.sint32);
          return valuestring;
       case CMPI_uint32:
          valuestring = malloc(100*sizeof(char));
-         sprintf(valuestring, "%u", data.value.uint32);
+         sprintf(valuestring, "%lu", data.value.uint32);
          return valuestring;
       case CMPI_sint64:
          valuestring = malloc(100*sizeof(char));
-         sprintf(valuestring, "%d", data.value.sint64);
+         sprintf(valuestring, "%lld", data.value.sint64);
          return valuestring;
       case CMPI_uint64:
          valuestring = malloc(100*sizeof(char));
-         sprintf(valuestring, "%u", data.value.uint64);
+         sprintf(valuestring, "%llu", data.value.uint64);
          return valuestring;
       case CMPI_string: {
          if (CMIsNullObject(data.value.string)) return NULL;
@@ -338,7 +338,7 @@
          return valuestring;
       case CMPI_real64:
          valuestring = malloc(100*sizeof(char));
-         sprintf(valuestring, "%.32e", data.value.real64);
+         sprintf(valuestring, "%.32le", data.value.real64);
          return valuestring;
       case CMPI_dateTime: {
          CMPIStatus status = {CMPI_RC_OK, NULL};