You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by af...@apache.org on 2007/05/14 18:40:36 UTC
svn commit: r537903 - in /logging/log4cxx/trunk: src/ tests/src/helpers/
Author: afester
Date: Mon May 14 09:40:32 2007
New Revision: 537903
URL: http://svn.apache.org/viewvc?view=rev&rev=537903
Log:
LOGCXX-14: necessary casts to avoid range overflow warning
Modified:
logging/log4cxx/trunk/src/fileappender.cpp
logging/log4cxx/trunk/src/unicodehelper.cpp
logging/log4cxx/trunk/tests/src/helpers/charsetdecodertestcase.cpp
logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp
logging/log4cxx/trunk/tests/src/helpers/transcodertestcase.cpp
logging/log4cxx/trunk/tests/src/helpers/unicodehelpertestcase.cpp
Modified: logging/log4cxx/trunk/src/fileappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/fileappender.cpp?view=diff&rev=537903&r1=537902&r2=537903
==============================================================================
--- logging/log4cxx/trunk/src/fileappender.cpp (original)
+++ logging/log4cxx/trunk/src/fileappender.cpp Mon May 14 09:40:32 2007
@@ -236,7 +236,7 @@
// if a new file and UTF-16, then write a BOM
//
if (writeBOM) {
- char bom[] = { 0xFE, 0xFF };
+ char bom[] = { (char) 0xFE, (char) 0xFF };
ByteBuffer buf(bom, 2);
outStream->write(buf, p);
}
Modified: logging/log4cxx/trunk/src/unicodehelper.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/unicodehelper.cpp?view=diff&rev=537903&r1=537902&r2=537903
==============================================================================
--- logging/log4cxx/trunk/src/unicodehelper.cpp (original)
+++ logging/log4cxx/trunk/src/unicodehelper.cpp Mon May 14 09:40:32 2007
@@ -117,9 +117,9 @@
//
// output UTF-8 encoding of 0xFFFF
//
- dst[0] = 0xEF;
- dst[1] = 0xBF;
- dst[2] = 0xBF;
+ dst[0] = (char) 0xEF;
+ dst[1] = (char) 0xBF;
+ dst[2] = (char) 0xBF;
return 3;
}
}
@@ -140,7 +140,7 @@
dst[3] = (char) (ch & 0xFF);
return 4;
}
- dst[0] = dst[1] = 0xFF;
+ dst[0] = dst[1] = (char) 0xFF;
return 2;
}
@@ -158,7 +158,7 @@
dst[2] = (char) (ch & 0xFF);
return 4;
}
- dst[0] = dst[1] = 0xFF;
+ dst[0] = dst[1] = (char) 0xFF;
return 2;
}
Modified: logging/log4cxx/trunk/tests/src/helpers/charsetdecodertestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/charsetdecodertestcase.cpp?view=diff&rev=537903&r1=537902&r2=537903
==============================================================================
--- logging/log4cxx/trunk/tests/src/helpers/charsetdecodertestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/helpers/charsetdecodertestcase.cpp Mon May 14 09:40:32 2007
@@ -149,11 +149,11 @@
#if LOG4CXX_LOGCHAR_IS_UTF8
const logchar greet[] = { 'A',
- 0xD8, 0x85,
- 0xD4, 0xB0,
- 0xE0, 0xA6, 0x86,
- 0xE4, 0xB8, 0x83,
- 0xD0, 0x80,
+ (char) 0xD8, (char) 0x85,
+ (char) 0xD4, (char) 0xB0,
+ (char) 0xE0, (char) 0xA6, (char) 0x86,
+ (char) 0xE4, (char) 0xB8, (char) 0x83,
+ (char) 0xD0, (char) 0x80,
0 };
#endif
Modified: logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp?view=diff&rev=537903&r1=537902&r2=537903
==============================================================================
--- logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp Mon May 14 09:40:32 2007
@@ -105,11 +105,11 @@
#if LOG4CXX_LOGCHAR_IS_UTF8
const char greet[] = { 'A',
- 0xD8, 0x85,
- 0xD4, 0xB0,
- 0xE0, 0xA6, 0x86,
- 0xE4, 0xB8, 0x83,
- 0xD0, 0x80,
+ (char) 0xD8, (char) 0x85,
+ (char) 0xD4, (char) 0xB0,
+ (char) 0xE0, (char) 0xA6, (char) 0x86,
+ (char) 0xE4, (char) 0xB8, (char) 0x83,
+ (char) 0xD0, (char) 0x80,
0 };
#endif
LogString greeting(greet);
@@ -131,11 +131,11 @@
void encode4() {
const char utf8_greet[] = { 'A',
- 0xD8, 0x85,
- 0xD4, 0xB0,
- 0xE0, 0xA6, 0x86,
- 0xE4, 0xB8, 0x83,
- 0xD0, 0x80,
+ (char) 0xD8, (char) 0x85,
+ (char) 0xD4, (char) 0xB0,
+ (char) 0xE0, (char) 0xA6, (char) 0x86,
+ (char) 0xE4, (char) 0xB8, (char) 0x83,
+ (char) 0xD0, (char) 0x80,
0 };
#if LOG4CXX_LOGCHAR_IS_WCHAR
// arbitrary, hopefully meaningless, characters from
Modified: logging/log4cxx/trunk/tests/src/helpers/transcodertestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/transcodertestcase.cpp?view=diff&rev=537903&r1=537902&r2=537903
==============================================================================
--- logging/log4cxx/trunk/tests/src/helpers/transcodertestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/helpers/transcodertestcase.cpp Mon May 14 09:40:32 2007
@@ -174,11 +174,11 @@
#if LOG4CXX_LOGCHAR_IS_UTF8
const char greeting[] = { 'A',
- 0xD8, 0x85,
- 0xD4, 0xB0,
- 0xE0, 0xCC, 0x84,
- 0xE8, 0x87, 0x83,
- 0xD0, 0x80,
+ (char) 0xD8, (char) 0x85,
+ (char) 0xD4, (char) 0xB0,
+ (char) 0xE0, (char) 0xCC, (char) 0x84,
+ (char) 0xE8, (char) 0x87, (char) 0x83,
+ (char) 0xD0, (char) 0x80,
0 };
#endif
Modified: logging/log4cxx/trunk/tests/src/helpers/unicodehelpertestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/unicodehelpertestcase.cpp?view=diff&rev=537903&r1=537902&r2=537903
==============================================================================
--- logging/log4cxx/trunk/tests/src/helpers/unicodehelpertestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/helpers/unicodehelpertestcase.cpp Mon May 14 09:40:32 2007
@@ -51,21 +51,21 @@
}
void testDecodeUTF8_2() {
- const char src[] = { 0x80};
+ const char src[] = { (char) 0x80};
const char* iter = src;
unsigned int sv = UnicodeHelper::decodeUTF8(iter, src + 1);
CPPUNIT_ASSERT_EQUAL((unsigned int) 0xFFFF, sv);
}
void testDecodeUTF8_3() {
- const char src[] = { 0xC2, 0xA9};
+ const char src[] = { (char) 0xC2, (char) 0xA9};
const char* iter = src;
unsigned int sv = UnicodeHelper::decodeUTF8(iter, src + 1);
CPPUNIT_ASSERT_EQUAL((unsigned int) 0xFFFF, sv);
}
void testDecodeUTF8_4() {
- const char src[] = { 0xC2, 0xA9};
+ const char src[] = { (char) 0xC2, (char) 0xA9};
const char* iter = src;
unsigned int sv = UnicodeHelper::decodeUTF8(iter, src + 2);
CPPUNIT_ASSERT_EQUAL((unsigned int) 0xA9, sv);