EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

avoid compiler warning on 64 bit machines

Browse Source
This commit is contained in:
zimoch
2008-09-16 07:27:27 +00:00
parent b50aec424f
commit 5fdf3912c8
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/RegexpConverter.cc
View File

@ -112,7 +112,7 @@ scanString(const StreamFormat& fmt, const char* input,
if (!(fmt.flags & sign_flag)) {
debug("Matching string \"%s\" too long (%d>%d bytes)\n",
StreamBuffer(input+ovector[subexpr*2], len).expand()(),
len, maxlen-1);
(int)len, (int)maxlen-1);
return -1;
}
len = maxlen-1;

4
src/StreamEpics.cc
View File

@ -501,8 +501,8 @@ long streamScanSep(dbCommon* record)
long streamScanfN(dbCommon* record, format_t *format,
void* value, size_t maxStringSize)
{
debug("streamScanfN(%s,format=%%%c,maxStringSize=%d)\n",
record->name, format->priv->conv, maxStringSize);
debug("streamScanfN(%s,format=%%%c,maxStringSize=%ld)\n",
record->name, format->priv->conv, (long)maxStringSize);
Stream* pstream = (Stream*)record->dpvt;
if (!pstream) return ERROR;
if (!pstream->scan(format, value, maxStringSize))

16
src/StreamFormatConverter.cc
View File

@ -160,7 +160,8 @@ scanLong(const StreamFormat& fmt, const char* input, long& value)
int length = -1;
if (fmt.flags & skip_flag)
{
/* on vxWorks, return value of sscanf with %*... is buggy */
/* can't use return value on vxWorks: sscanf with %* format
returns -1 at end of string whether value is found or not */
sscanf(input, fmt.info, &length);
}
else
@ -217,7 +218,8 @@ scanDouble(const StreamFormat& fmt, const char* input, double& value)
int length = -1;
if (fmt.flags & skip_flag)
{
/* on vxWorks, return value of sscanf with %*... is buggy */
/* can't use return value on vxWorks: sscanf with %* format
returns -1 at end of string whether value is found or not */
sscanf(input, fmt.info, &length);
}
else
@ -281,7 +283,8 @@ scanString(const StreamFormat& fmt, const char* input,
}
if (fmt.flags & skip_flag)
{
/* on vxWorks, return value of sscanf with %*... is buggy */
/* can't use return value on vxWorks: sscanf with %* format
returns -1 at end of string whether value is found or not */
sscanf(input, fmt.info, &length);
}
else
@ -291,7 +294,7 @@ scanString(const StreamFormat& fmt, const char* input,
if (maxlen <= fmt.width || fmt.width == 0)
{
// assure not to read too much
sprintf(tmpformat, "%%%d%c%%n", maxlen-1, fmt.conv);
sprintf(tmpformat, "%%%ld%c%%n", (long)maxlen-1, fmt.conv);
f = tmpformat;
}
else
@ -409,7 +412,8 @@ scanString(const StreamFormat& fmt, const char* input,
int length = -1;
if (fmt.flags & skip_flag)
{
/* on vxWorks, return value of sscanf with %*... is buggy */
/* can't use return value on vxWorks: sscanf with %* format
returns -1 at end of string whether value is found or not */
sscanf(input, fmt.info, &length);
}
else
@ -420,7 +424,7 @@ scanString(const StreamFormat& fmt, const char* input,
{
const char *p = strchr (fmt.info, '[');
// assure not to read too much
sprintf(tmpformat, "%%%d%s", maxlen-1, p);
sprintf(tmpformat, "%%%ld%s", (long)maxlen-1, p);
f = tmpformat;
}
else