From 8da0014091412b5a66453d25a4b484e67b9468a9 Mon Sep 17 00:00:00 2001 From: zimoch Date: Wed, 4 Jan 2012 15:49:53 +0000 Subject: [PATCH] need to rename StreamBuffer method printf to print because on cris architecture printf is a macro. --- src/ChecksumConverter.cc | 4 ++-- src/MantissaExponentConverter.cc | 2 +- src/RegexpConverter.cc | 2 +- src/StreamBuffer.cc | 10 +++++----- src/StreamBuffer.h | 3 +-- src/StreamCore.cc | 6 +++--- src/StreamError.cc | 1 + src/StreamError.h | 2 +- src/StreamFormatConverter.cc | 8 ++++---- src/StreamProtocol.cc | 6 +++--- src/TimestampConverter.cc | 6 +++--- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/ChecksumConverter.cc b/src/ChecksumConverter.cc index 1416468..668ca28 100644 --- a/src/ChecksumConverter.cc +++ b/src/ChecksumConverter.cc @@ -563,7 +563,7 @@ printPseudo(const StreamFormat& format, StreamBuffer& output) debug("ChecksumConverter %s: little endian appending 0x%X\n", checksumMap[fnum].name, outchar); if (format.flags & zero_flag) // ASCII - output.printf("%02X", outchar); + output.print("%02X", outchar); else // binary output.append(outchar); sum >>= 8; @@ -578,7 +578,7 @@ printPseudo(const StreamFormat& format, StreamBuffer& output) debug("ChecksumConverter %s: big endian appending 0x%X\n", checksumMap[fnum].name, outchar); if (format.flags & zero_flag) // ASCII - output.printf("%02X", outchar); + output.print("%02X", outchar); else // binary output.append(outchar); sum <<= 8; diff --git a/src/MantissaExponentConverter.cc b/src/MantissaExponentConverter.cc index fe1198e..8b13442 100644 --- a/src/MantissaExponentConverter.cc +++ b/src/MantissaExponentConverter.cc @@ -75,7 +75,7 @@ printDouble(const StreamFormat& fmt, StreamBuffer& output, double value) int prec = fmt.prec; 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(buf.find('e'),1); diff --git a/src/RegexpConverter.cc b/src/RegexpConverter.cc index 2ff54e4..a1e017c 100644 --- a/src/RegexpConverter.cc +++ b/src/RegexpConverter.cc @@ -70,7 +70,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info, } if (*source == esc) { source++; - pattern.printf("\\x%02x", *source++ & 0xFF); + pattern.print("\\x%02x", *source++ & 0xFF); continue; } pattern.append(*source++); diff --git a/src/StreamBuffer.cc b/src/StreamBuffer.cc index 735166e..1bbb525 100644 --- a/src/StreamBuffer.cc +++ b/src/StreamBuffer.cc @@ -248,7 +248,7 @@ replace(long remstart, long remlen, const void* ins, long inslen) } StreamBuffer& StreamBuffer:: -printf(const char* fmt, ...) +print(const char* fmt, ...) { va_list va; int printed; @@ -296,7 +296,7 @@ StreamBuffer StreamBuffer::expand(long start, long length) const c = buffer[i]; if ((c & 0x7f) < 0x20 || (c & 0x7f) == 0x7f) { - result.printf("<%02x>", c & 0xff); + result.print("<%02x>", c & 0xff); } else { @@ -312,17 +312,17 @@ dump() const StreamBuffer result(256+cap*5); result.append("\033[0m"); 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++) { if (i == offs) result.append("\033[34m[\033[0m"); if ((buffer[i] & 0x7f) < 0x20 || (buffer[i] & 0x7f) == 0x7f) { if (i < offs || i >= offs+len) - result.printf( + result.print( "<%02x>", buffer[i] & 0xff); else - result.printf( + result.print( "\033[34m<%02x>\033[37m", buffer[i] & 0xff); } else diff --git a/src/StreamBuffer.h b/src/StreamBuffer.h index 9bf8585..a081b5b 100644 --- a/src/StreamBuffer.h +++ b/src/StreamBuffer.h @@ -21,7 +21,6 @@ #define StreamBuffer_h #include -#include #ifndef __GNUC__ #define __attribute__(x) @@ -189,7 +188,7 @@ public: StreamBuffer& insert(long pos, char c) {return replace(pos, 0, &c, 1);} - StreamBuffer& printf(const char* fmt, ...) + StreamBuffer& print(const char* fmt, ...) __attribute__ ((format(printf,2,3))); // find: get index of data in buffer or -1 diff --git a/src/StreamCore.cc b/src/StreamCore.cc index c6b322a..de6eeb9 100644 --- a/src/StreamCore.cc +++ b/src/StreamCore.cc @@ -57,12 +57,12 @@ static char* printCommands(StreamBuffer& buffer, const char* c) break; case wait_cmd: timeout = extract(c); - buffer.printf(" wait %ld;\n # ms", timeout); + buffer.print(" wait %ld;\n # ms", timeout); break; case event_cmd: eventnumber = extract(c); timeout = extract(c); - buffer.printf(" event(%ld) %ld; # ms\n", eventnumber, timeout); + buffer.print(" event(%ld) %ld; # ms\n", eventnumber, timeout); break; case exec_cmd: buffer.append(" exec \""); @@ -71,7 +71,7 @@ static char* printCommands(StreamBuffer& buffer, const char* c) break; case connect_cmd: timeout = extract(c); - buffer.printf(" connect %ld; # ms\n", timeout); + buffer.print(" connect %ld; # ms\n", timeout); break; case disconnect_cmd: buffer.append(" disconnect;\n"); diff --git a/src/StreamError.cc b/src/StreamError.cc index e24ff15..8b36a41 100644 --- a/src/StreamError.cc +++ b/src/StreamError.cc @@ -20,6 +20,7 @@ #include "StreamError.h" #include #include +#include int streamDebug = 0; extern "C" { diff --git a/src/StreamError.h b/src/StreamError.h index 52ddda7..497cf79 100644 --- a/src/StreamError.h +++ b/src/StreamError.h @@ -20,8 +20,8 @@ #ifndef StreamError_h #define StreamError_h -#include #include +#include #ifndef __GNUC__ #define __attribute__(x) diff --git a/src/StreamFormatConverter.cc b/src/StreamFormatConverter.cc index 216d9e9..5cf2f62 100644 --- a/src/StreamFormatConverter.cc +++ b/src/StreamFormatConverter.cc @@ -316,7 +316,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info, bool StdLongConverter:: printLong(const StreamFormat& fmt, StreamBuffer& output, long value) { - output.printf(fmt.info, value); + output.print(fmt.info, value); return true; } @@ -395,7 +395,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info, bool StdDoubleConverter:: printDouble(const StreamFormat& fmt, StreamBuffer& output, double value) { - output.printf(fmt.info, value); + output.print(fmt.info, value); return true; } @@ -451,7 +451,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info, bool StdStringConverter:: printString(const StreamFormat& fmt, StreamBuffer& output, const char* value) { - output.printf(fmt.info, value); + output.print(fmt.info, value); return true; } @@ -549,7 +549,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info, bool StdCharsConverter:: printLong(const StreamFormat& fmt, StreamBuffer& output, long value) { - output.printf(fmt.info, value); + output.print(fmt.info, value); return true; } diff --git a/src/StreamProtocol.cc b/src/StreamProtocol.cc index dedbdb7..0cb40c7 100644 --- a/src/StreamProtocol.cc +++ b/src/StreamProtocol.cc @@ -634,7 +634,7 @@ printString(StreamBuffer& buffer, const char* s) switch (*s) { case esc: - buffer.printf("\\x%02x", (*++s) & 0xff); + buffer.print("\\x%02x", (*++s) & 0xff); break; case '\r': buffer.append("\\r"); @@ -655,7 +655,7 @@ printString(StreamBuffer& buffer, const char* s) buffer.append("\\\\"); break; case format_field: - buffer.printf("%%(%s)", ++s); + buffer.print("%%(%s)", ++s); while (*s++); s += extract(s); // skip fieldaddress goto format; @@ -670,7 +670,7 @@ format: { continue; default: if ((*s & 0x7f) < 0x20 || (*s & 0x7f) == 0x7f) - buffer.printf("\\x%02x", *s & 0xff); + buffer.print("\\x%02x", *s & 0xff); else buffer.append(*s); } diff --git a/src/TimestampConverter.cc b/src/TimestampConverter.cc index e540b4c..bc3ca2b 100644 --- a/src/TimestampConverter.cc +++ b/src/TimestampConverter.cc @@ -82,14 +82,14 @@ parse(const StreamFormat&, StreamBuffer& info, if (*c == 'f') { source = c; - info.printf("%%0%uf", n); + info.print("%%0%uf", n); break; } } /* look for nanoseconds %N of %f */ if (*source == 'N' || *source == 'f') { - info.printf("%%09f"); + info.print("%%09f"); break; } /* look for seconds with fractions like %.3S */ @@ -100,7 +100,7 @@ parse(const StreamFormat&, StreamBuffer& info, if (toupper(*c) == 'S') { source = c; - info.printf("%%%c.%%0%uf", *c, n); + info.print("%%%c.%%0%uf", *c, n); break; } }