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

need to rename StreamBuffer method printf to print because on cris architecture printf is a macro.

Browse Source
This commit is contained in:
zimoch
2012-01-04 15:49:53 +00:00
parent 60d292b3ea
commit 8da0014091
11 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChecksumConverter.cc
View File

@ -563,7 +563,7 @@ printPseudo(const StreamFormat& format, StreamBuffer& output)
debug("ChecksumConverter %s: little endian appending 0x%X\n", debug("ChecksumConverter %s: little endian appending 0x%X\n",
checksumMap[fnum].name, outchar); checksumMap[fnum].name, outchar);
if (format.flags & zero_flag) // ASCII if (format.flags & zero_flag) // ASCII
output.printf("%02X", outchar); output.print("%02X", outchar);
else // binary else // binary
output.append(outchar); output.append(outchar);
sum >>= 8; sum >>= 8;
@ -578,7 +578,7 @@ printPseudo(const StreamFormat& format, StreamBuffer& output)
debug("ChecksumConverter %s: big endian appending 0x%X\n", debug("ChecksumConverter %s: big endian appending 0x%X\n",
checksumMap[fnum].name, outchar); checksumMap[fnum].name, outchar);
if (format.flags & zero_flag) // ASCII if (format.flags & zero_flag) // ASCII
output.printf("%02X", outchar); output.print("%02X", outchar);
else // binary else // binary
output.append(outchar); output.append(outchar);
sum <<= 8; sum <<= 8;

2
src/MantissaExponentConverter.cc
View File

@ -75,7 +75,7 @@ printDouble(const StreamFormat& fmt, StreamBuffer& output, double value)
int prec = fmt.prec; int prec = fmt.prec;
if (prec < 1) prec = 6; if (prec < 1) prec = 6;
buf.printf("%.*e", prec-1, fabs(value)/pow(10.0, prec-1)); buf.print("%.*e", prec-1, fabs(value)/pow(10.0, prec-1));
buf.remove(1,1); buf.remove(1,1);
buf.remove(buf.find('e'),1); buf.remove(buf.find('e'),1);

2
src/RegexpConverter.cc
View File

@ -70,7 +70,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
} }
if (*source == esc) { if (*source == esc) {
source++; source++;
pattern.printf("\\x%02x", *source++ & 0xFF); pattern.print("\\x%02x", *source++ & 0xFF);
continue; continue;
} }
pattern.append(*source++); pattern.append(*source++);

10
src/StreamBuffer.cc
View File

@ -248,7 +248,7 @@ replace(long remstart, long remlen, const void* ins, long inslen)
} }
StreamBuffer& StreamBuffer:: StreamBuffer& StreamBuffer::
printf(const char* fmt, ...) print(const char* fmt, ...)
{ {
va_list va; va_list va;
int printed; int printed;
@ -296,7 +296,7 @@ StreamBuffer StreamBuffer::expand(long start, long length) const
c = buffer[i]; c = buffer[i];
if ((c & 0x7f) < 0x20 || (c & 0x7f) == 0x7f) if ((c & 0x7f) < 0x20 || (c & 0x7f) == 0x7f)
{ {
result.printf("<%02x>", c & 0xff); result.print("<%02x>", c & 0xff);
} }
else else
{ {
@ -312,17 +312,17 @@ dump() const
StreamBuffer result(256+cap*5); StreamBuffer result(256+cap*5);
result.append("\033[0m"); result.append("\033[0m");
long i; long i;
result.printf("%ld,%ld,%ld:\033[37m", offs, len, cap); result.print("%ld,%ld,%ld:\033[37m", offs, len, cap);
for (i = 0; i < cap; i++) for (i = 0; i < cap; i++)
{ {
if (i == offs) result.append("\033[34m[\033[0m"); if (i == offs) result.append("\033[34m[\033[0m");
if ((buffer[i] & 0x7f) < 0x20 || (buffer[i] & 0x7f) == 0x7f) if ((buffer[i] & 0x7f) < 0x20 || (buffer[i] & 0x7f) == 0x7f)
{ {
if (i < offs || i >= offs+len) if (i < offs || i >= offs+len)
result.printf( result.print(
"<%02x>", buffer[i] & 0xff); "<%02x>", buffer[i] & 0xff);
else else
result.printf( result.print(
"\033[34m<%02x>\033[37m", buffer[i] & 0xff); "\033[34m<%02x>\033[37m", buffer[i] & 0xff);
} }
else else

3
src/StreamBuffer.h
View File

@ -21,7 +21,6 @@
#define StreamBuffer_h #define StreamBuffer_h
#include <string.h> #include <string.h>
#include <stdio.h>
#ifndef __GNUC__ #ifndef __GNUC__
#define __attribute__(x) #define __attribute__(x)
@ -189,7 +188,7 @@ public:
StreamBuffer& insert(long pos, char c) StreamBuffer& insert(long pos, char c)
{return replace(pos, 0, &c, 1);} {return replace(pos, 0, &c, 1);}
StreamBuffer& printf(const char* fmt, ...) StreamBuffer& print(const char* fmt, ...)
__attribute__ ((format(printf,2,3))); __attribute__ ((format(printf,2,3)));
// find: get index of data in buffer or -1 // find: get index of data in buffer or -1

6
src/StreamCore.cc
View File

@ -57,12 +57,12 @@ static char* printCommands(StreamBuffer& buffer, const char* c)
break; break;
case wait_cmd: case wait_cmd:
timeout = extract<unsigned long>(c); timeout = extract<unsigned long>(c);
buffer.printf(" wait %ld;\n # ms", timeout); buffer.print(" wait %ld;\n # ms", timeout);
break; break;
case event_cmd: case event_cmd:
eventnumber = extract<unsigned long>(c); eventnumber = extract<unsigned long>(c);
timeout = extract<unsigned long>(c); timeout = extract<unsigned long>(c);
buffer.printf(" event(%ld) %ld; # ms\n", eventnumber, timeout); buffer.print(" event(%ld) %ld; # ms\n", eventnumber, timeout);
break; break;
case exec_cmd: case exec_cmd:
buffer.append(" exec \""); buffer.append(" exec \"");
@ -71,7 +71,7 @@ static char* printCommands(StreamBuffer& buffer, const char* c)
break; break;
case connect_cmd: case connect_cmd:
timeout = extract<unsigned long>(c); timeout = extract<unsigned long>(c);
buffer.printf(" connect %ld; # ms\n", timeout); buffer.print(" connect %ld; # ms\n", timeout);
break; break;
case disconnect_cmd: case disconnect_cmd:
buffer.append(" disconnect;\n"); buffer.append(" disconnect;\n");

1
src/StreamError.cc
View File

@ -20,6 +20,7 @@
#include "StreamError.h" #include "StreamError.h"
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <stdio.h>
int streamDebug = 0; int streamDebug = 0;
extern "C" { extern "C" {

2
src/StreamError.h
View File

@ -20,8 +20,8 @@
#ifndef StreamError_h #ifndef StreamError_h
#define StreamError_h #define StreamError_h
#include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h>
#ifndef __GNUC__ #ifndef __GNUC__
#define __attribute__(x) #define __attribute__(x)

8
src/StreamFormatConverter.cc
View File

@ -316,7 +316,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
bool StdLongConverter:: bool StdLongConverter::
printLong(const StreamFormat& fmt, StreamBuffer& output, long value) printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
{ {
output.printf(fmt.info, value); output.print(fmt.info, value);
return true; return true;
} }
@ -395,7 +395,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
bool StdDoubleConverter:: bool StdDoubleConverter::
printDouble(const StreamFormat& fmt, StreamBuffer& output, double value) printDouble(const StreamFormat& fmt, StreamBuffer& output, double value)
{ {
output.printf(fmt.info, value); output.print(fmt.info, value);
return true; return true;
} }
@ -451,7 +451,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
bool StdStringConverter:: bool StdStringConverter::
printString(const StreamFormat& fmt, StreamBuffer& output, const char* value) printString(const StreamFormat& fmt, StreamBuffer& output, const char* value)
{ {
output.printf(fmt.info, value); output.print(fmt.info, value);
return true; return true;
} }
@ -549,7 +549,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
bool StdCharsConverter:: bool StdCharsConverter::
printLong(const StreamFormat& fmt, StreamBuffer& output, long value) printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
{ {
output.printf(fmt.info, value); output.print(fmt.info, value);
return true; return true;
} }

6
src/StreamProtocol.cc
View File

@ -634,7 +634,7 @@ printString(StreamBuffer& buffer, const char* s)
switch (*s) switch (*s)
{ {
case esc: case esc:
buffer.printf("\\x%02x", (*++s) & 0xff); buffer.print("\\x%02x", (*++s) & 0xff);
break; break;
case '\r': case '\r':
buffer.append("\\r"); buffer.append("\\r");
@ -655,7 +655,7 @@ printString(StreamBuffer& buffer, const char* s)
buffer.append("\\\\"); buffer.append("\\\\");
break; break;
case format_field: case format_field:
buffer.printf("%%(%s)", ++s); buffer.print("%%(%s)", ++s);
while (*s++); while (*s++);
s += extract<unsigned short>(s); // skip fieldaddress s += extract<unsigned short>(s); // skip fieldaddress
goto format; goto format;
@ -670,7 +670,7 @@ format: {
continue; continue;
default: default:
if ((*s & 0x7f) < 0x20 || (*s & 0x7f) == 0x7f) if ((*s & 0x7f) < 0x20 || (*s & 0x7f) == 0x7f)
buffer.printf("\\x%02x", *s & 0xff); buffer.print("\\x%02x", *s & 0xff);
else else
buffer.append(*s); buffer.append(*s);
} }

6
src/TimestampConverter.cc
View File

@ -82,14 +82,14 @@ parse(const StreamFormat&, StreamBuffer& info,
if (*c == 'f') if (*c == 'f')
{ {
source = c; source = c;
info.printf("%%0%uf", n); info.print("%%0%uf", n);
break; break;
} }
} }
/* look for nanoseconds %N of %f */ /* look for nanoseconds %N of %f */
if (*source == 'N' || *source == 'f') if (*source == 'N' || *source == 'f')
{ {
info.printf("%%09f"); info.print("%%09f");
break; break;
} }
/* look for seconds with fractions like %.3S */ /* look for seconds with fractions like %.3S */
@ -100,7 +100,7 @@ parse(const StreamFormat&, StreamBuffer& info,
if (toupper(*c) == 'S') if (toupper(*c) == 'S')
{ {
source = c; source = c;
info.printf("%%%c.%%0%uf", *c, n); info.print("%%%c.%%0%uf", *c, n);
break; break;
} }
} }