diff --git a/pvDataApp/factory/Convert.cpp b/pvDataApp/factory/Convert.cpp index 2e7b982..a6efd37 100644 --- a/pvDataApp/factory/Convert.cpp +++ b/pvDataApp/factory/Convert.cpp @@ -195,7 +195,7 @@ template<> String scalarToString(uint32 value) { char buffer[20]; - sprintf(buffer,"%ud",value); + sprintf(buffer,"%ud",(unsigned int)value); return String(buffer); } @@ -1089,19 +1089,19 @@ String Convert::toString(PVScalarPtr const & pv) case pvByte: { PVBytePtr value = static_pointer_cast(pv); char buffer[30]; - sprintf(buffer,"%d",(int32)value->get()); + sprintf(buffer,"%d",(int)value->get()); return String(buffer); } case pvShort: { PVShortPtr value = static_pointer_cast(pv); char buffer[30]; - sprintf(buffer,"%d",(int32)value->get()); + sprintf(buffer,"%d",(int)value->get()); return String(buffer); } case pvInt: { PVIntPtr value = static_pointer_cast(pv); char buffer[30]; - sprintf(buffer,"%d",(int32)value->get()); + sprintf(buffer,"%d",(int)value->get()); return String(buffer); } case pvLong: { @@ -1113,19 +1113,19 @@ String Convert::toString(PVScalarPtr const & pv) case pvUByte: { PVUBytePtr value = static_pointer_cast(pv); char buffer[30]; - sprintf(buffer,"%u",(uint32)value->get()); + sprintf(buffer,"%u",(unsigned int)value->get()); return String(buffer); } case pvUShort: { PVUShortPtr value = static_pointer_cast(pv); char buffer[30]; - sprintf(buffer,"%u",(uint32)value->get()); + sprintf(buffer,"%u",(unsigned int)value->get()); return String(buffer); } case pvUInt: { PVUIntPtr value = static_pointer_cast(pv); char buffer[30]; - sprintf(buffer,"%u",value->get()); + sprintf(buffer,"%u",(unsigned int)value->get()); return String(buffer); } case pvULong: { @@ -1143,7 +1143,7 @@ String Convert::toString(PVScalarPtr const & pv) case pvDouble: { PVDoublePtr value = static_pointer_cast(pv); char buffer[30]; - sprintf(buffer,"%lg",value->get()); + sprintf(buffer,"%g",value->get()); return String(buffer); } case pvString: { @@ -2685,7 +2685,7 @@ void convertToString(StringBuilder buffer,PVField const * pv,int indentLevel) case pvDouble: { PVDouble const *data = static_cast(pv); char xxx[30]; - sprintf(xxx,"%lg",data->get()); + sprintf(xxx,"%g",data->get()); *buffer += xxx; } return; @@ -2926,7 +2926,7 @@ void convertArray(StringBuilder buffer,PVScalarArray const * xxx,int indentLevel if(num==1) { double val = data.data[data.offset]; char buf[16]; - sprintf(buf,"%lg",val); + sprintf(buf,"%g",val); *buffer += buf; } else { *buffer += "???? "; diff --git a/pvDataApp/misc/bitSet.cpp b/pvDataApp/misc/bitSet.cpp index 4624652..4576ddb 100644 --- a/pvDataApp/misc/bitSet.cpp +++ b/pvDataApp/misc/bitSet.cpp @@ -337,10 +337,10 @@ namespace epics { namespace pvData { int32 i = nextSetBit(0); char tmp[30]; if (i != -1) { - sprintf(tmp,"%d",i); *buffer += tmp; + sprintf(tmp,"%d",(int)i); *buffer += tmp; for (i = nextSetBit(i+1); i >= 0; i = nextSetBit(i+1)) { int32 endOfRun = nextClearBit(i); - do { *buffer += ", "; sprintf(tmp,"%d",i); *buffer += tmp; } while (++i < endOfRun); + do { *buffer += ", "; sprintf(tmp,"%d",(int)i); *buffer += tmp; } while (++i < endOfRun); } } *buffer += '}'; diff --git a/testApp/misc/testTimeStamp.cpp b/testApp/misc/testTimeStamp.cpp index a0f48dd..d2a044f 100644 --- a/testApp/misc/testTimeStamp.cpp +++ b/testApp/misc/testTimeStamp.cpp @@ -32,10 +32,10 @@ void testTimeStamp(FILE *fd,FILE *auxfd) assert(nanoSecPerSec==1000000000); TimeStamp current; current.getCurrent(); - fprintf(auxfd,"current %lli %i milliSec %li\n", - current.getSecondsPastEpoch(), + fprintf(auxfd,"current %lli %i milliSec %lli\n", + (long long)current.getSecondsPastEpoch(), current.getNanoSeconds(), - current.getMilliseconds()); + (long long)current.getMilliseconds()); time_t tt; current.toTime_t(tt); struct tm ctm; @@ -48,10 +48,10 @@ void testTimeStamp(FILE *fd,FILE *auxfd) (ctm.tm_isdst==0) ? "false" : "true"); tt = time(&tt); current.fromTime_t(tt); - fprintf(auxfd,"fromTime_t\ncurrent %lli %i milliSec %li\n", - current.getSecondsPastEpoch(), + fprintf(auxfd,"fromTime_t\ncurrent %lli %i milliSec %lli\n", + (long long)current.getSecondsPastEpoch(), current.getNanoSeconds(), - current.getMilliseconds()); + (long long)current.getMilliseconds()); current.toTime_t(tt); memcpy(&ctm,localtime(&tt),sizeof(struct tm)); fprintf(auxfd, diff --git a/testApp/pv/testPVAuxInfo.cpp b/testApp/pv/testPVAuxInfo.cpp index fb1a0e0..cb98403 100644 --- a/testApp/pv/testPVAuxInfo.cpp +++ b/testApp/pv/testPVAuxInfo.cpp @@ -52,9 +52,9 @@ static void printOffsets(PVStructurePtr pvStructure,FILE *fd) } fprintf(fd,"%s offset %lli next %lli number %lli\n", pvField->getFieldName().c_str(), - pvField->getFieldOffset(), - pvField->getNextFieldOffset(), - pvField->getNumberFields()); + (long long)pvField->getFieldOffset(), + (long long)pvField->getNextFieldOffset(), + (long long)pvField->getNumberFields()); } } diff --git a/testApp/pv/testPVScalarArray.cpp b/testApp/pv/testPVScalarArray.cpp index c787269..e709831 100644 --- a/testApp/pv/testPVScalarArray.cpp +++ b/testApp/pv/testPVScalarArray.cpp @@ -143,20 +143,20 @@ static void longArray() LongArray_iterator iter = data.data.begin(); if(debug) fprintf(fd,"iter ["); for(iter=data.data.begin();iter!=data.data.end();++iter) { - if(debug) fprintf(fd,"%lli ",*iter); + if(debug) fprintf(fd,"%lli ",(long long)*iter); } if(debug) fprintf(fd,"]\n"); if(debug) fprintf(fd,"raw ["); int64 * pdata = get(data.data); for(size_t i=0; i