epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

removed sprintf format warnings

Browse Source
This commit is contained in:
Unknown
2012-09-14 13:54:35 +02:00
parent 0b4a8550e5
commit 6a378dae0d
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pvDataApp/factory/Convert.cpp
View File

@@ -195,7 +195,7 @@ template<>
String scalarToString<uint32>(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<PVByte>(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<PVShort>(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<PVInt>(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<PVUByte>(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<PVUShort>(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<PVUInt>(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<PVDouble>(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<PVDouble const *>(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 += "???? ";

4
pvDataApp/misc/bitSet.cpp
View File

@@ -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 += '}';

12
testApp/misc/testTimeStamp.cpp
View File

@@ -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,

6
testApp/pv/testPVAuxInfo.cpp
View File

@@ -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());
}
}

12
testApp/pv/testPVScalarArray.cpp
View File

@@ -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<length; i++) {
int64 val = pdata[i];
if(debug) fprintf(fd,"%lli ",val);
if(debug) fprintf(fd,"%lli ",(long long)val);
}
if(debug) fprintf(fd,"]\n");
if(debug) fprintf(fd,"direct[");
for(size_t i=0; i<length; i++) {
int64 val = data.data[i];
if(debug) fprintf(fd,"%lli ",val);
if(debug) fprintf(fd,"%lli ",(long long)val);
}
if(debug) fprintf(fd,"]\n");
fprintf(fd,"longArray PASSED\n");
@@ -184,20 +184,20 @@ static void ulongArray()
ULongArray_iterator iter = data.data.begin();
if(debug) fprintf(fd,"iter [");
for(iter=data.data.begin();iter!=data.data.end();++iter) {
if(debug) fprintf(fd,"%llu ",*iter);
if(debug) fprintf(fd,"%llu ",(long long unsigned)*iter);
}
if(debug) fprintf(fd,"]\n");
if(debug) fprintf(fd,"raw [");
uint64 * pdata = get(data.data);
for(size_t i=0; i<length; i++) {
uint64 val = pdata[i];
if(debug) fprintf(fd,"%llu ",val);
if(debug) fprintf(fd,"%llu ",(long long unsigned)val);
}
if(debug) fprintf(fd,"]\n");
if(debug) fprintf(fd,"direct[");
for(size_t i=0; i<length; i++) {
uint64 val = data.data[i];
if(debug) fprintf(fd,"%llu ",val);
if(debug) fprintf(fd,"%llu ",(long long unsigned)val);
}
if(debug) fprintf(fd,"]\n");
fprintf(fd,"ulongArray PASSED\n");

4
testApp/pv/testPVType.cpp
View File

@@ -62,10 +62,10 @@ int main(int argc,char *argv[])
int64 longInt = 0x7fffffff;
longInt <<= 32;
longInt |= 0xffffffff;
fprintf(fd,"int8 max %lli",longInt);
fprintf(fd,"int8 max %lli",(long long)longInt);
longInt = intValue = 0x80000000;;
longInt <<= 32;
fprintf(fd," min %lli\n",longInt);
fprintf(fd," min %lli\n",(long long)longInt);
fprintf(fd,"PASSED\n");
return(0);