carnold 2004/12/16 17:36:04
Modified: include/log4cxx/helpers aprinitializer.h
include/log4cxx/net telnetappender.h
src aprinitializer.cpp cacheddateformat.cpp
consoleappender.cpp cyclicbuffer.cpp
datagrampacket.cpp datagramsocket.cpp
datelayout.cpp file.cpp fileappender.cpp
filewatchdog.cpp locationinfo.cpp loggingevent.cpp
logmanager.cpp optionconverter.cpp
patternconverter.cpp simpledateformat.cpp
sockethubappender.cpp socketimpl.cpp
socketinputstream.cpp socketnode.cpp
synchronized.cpp telnetappender.cpp timezone.cpp
transcoder.cpp
Log:
LOGCXX-10: tchar.h/Unicode: Still more cosmetic
Revision Changes Path
1.5 +5 -1 logging-log4cxx/include/log4cxx/helpers/aprinitializer.h
Index: aprinitializer.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/aprinitializer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aprinitializer.h 15 Dec 2004 00:38:47 -0000 1.4
+++ aprinitializer.h 17 Dec 2004 01:36:03 -0000 1.5
@@ -17,8 +17,11 @@
#ifndef _LOG4CXX_HELPERS_APRINITIALIZER_H
#define _LOG4CXX_HELPERS_APRINITIALIZER_H
+#include <log4cxx/portability.h>
+
class apr_pool_t;
+
namespace log4cxx
{
namespace helpers
@@ -26,13 +29,14 @@
class APRInitializer
{
public:
- static void initialize();
+ static log4cxx_time_t initialize();
private:
APRInitializer();
APRInitializer(const APRInitializer&);
APRInitializer& operator=(const APRInitializer&);
apr_pool_t * p;
+ log4cxx_time_t startTime;
public:
~APRInitializer();
};
1.17 +13 -13 logging-log4cxx/include/log4cxx/net/telnetappender.h
Index: telnetappender.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/net/telnetappender.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- telnetappender.h 15 Dec 2004 00:38:50 -0000 1.16
+++ telnetappender.h 17 Dec 2004 01:36:04 -0000 1.17
@@ -88,21 +88,21 @@
wait for connections. */
void activateOptions(apr_pool_t* p);
- /**
- Set options
- */
+ /**
+ Set options
+ */
virtual void setOption(const LogString& option,
const LogString& value);
- /**
- Returns value of the <b>Port</b> option.
- */
+ /**
+ Returns value of the
<b>Port</b> option.
+ */
int getPort() const
{ return port; }
- /**
- The <b>Port</b> option takes a positive integer representing
- the port where the server is waiting for connections.
- */
+ /**
+ The <b>Port</b> option takes a
positive integer representing
+ the port where the server is
waiting for connections.
+ */
void setPort(int port)
{ this->port = port; }
@@ -118,9 +118,9 @@
//---------------------------------------------------------- SocketHandler:
private:
- // prevent copy and assignment statements
- TelnetAppender(const TelnetAppender&);
- TelnetAppender& operator=(const TelnetAppender&);
+ // prevent copy and
assignment statements
+ TelnetAppender(const
TelnetAppender&);
+ TelnetAppender& operator=(const
TelnetAppender&);
typedef std::pair<helpers::SocketPtr,
helpers::SocketOutputStreamPtr> Connection;
typedef std::vector<Connection> ConnectionList;
1.2 +4 -1 logging-log4cxx/src/aprinitializer.cpp
Index: aprinitializer.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/aprinitializer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprinitializer.cpp 26 Nov 2004 07:23:30 -0000 1.1
+++ aprinitializer.cpp 17 Dec 2004 01:36:04 -0000 1.2
@@ -17,6 +17,7 @@
#include <log4cxx/helpers/aprinitializer.h>
#include <apr_pools.h>
#include <apr_atomic.h>
+#include <apr_time.h>
using namespace log4cxx::helpers;
using namespace log4cxx;
@@ -25,6 +26,7 @@
apr_initialize();
apr_pool_create(&p, NULL);
apr_atomic_init(p);
+ startTime = apr_time_now();
}
APRInitializer::~APRInitializer() {
@@ -32,6 +34,7 @@
apr_terminate();
}
-void APRInitializer::initialize() {
+log4cxx_time_t APRInitializer::initialize() {
static APRInitializer init;
+ return init.startTime;
}
1.7 +4 -6 logging-log4cxx/src/cacheddateformat.cpp
Index: cacheddateformat.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/cacheddateformat.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cacheddateformat.cpp 15 Dec 2004 08:10:39 -0000 1.6
+++ cacheddateformat.cpp 17 Dec 2004 01:36:04 -0000 1.7
@@ -60,7 +60,7 @@
//
// find first difference between values
//
- for (int i = 0; i < formatted.length(); i++) {
+ for (size_t i = 0; i < formatted.length(); i++) {
if (formatted[i] != plus987[i]) {
if (formatted[i] == zeroDigit && plus987[i] == nineDigit) {
return i;
@@ -114,7 +114,7 @@
prev -= APR_USEC_PER_SEC;
}
previousTime = prev;
- int prevLength = cache.length();
+ size_t prevLength = cache.length();
cache.erase(cache.begin(), cache.end());
formatter->format(cache, date, p);
//
@@ -144,10 +144,9 @@
*/
void CachedDateFormat::setTimeZone(const TimeZonePtr& timeZone) {
formatter->setTimeZone(timeZone);
- int prevLength = cache.length();
+ size_t prevLength = cache.length();
cache.erase(cache.begin(), cache.end());
- apr_pool_t *p;
- apr_status_t stat = apr_pool_create(&p, NULL);
+ Pool p;
formatter->format(cache, previousTime, p);
//
// if the length changed then
@@ -159,7 +158,6 @@
nineDigit,
formatter, p);
}
- apr_pool_destroy(p);
}
1.10 +4 -3 logging-log4cxx/src/consoleappender.cpp
Index: consoleappender.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/consoleappender.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- consoleappender.cpp 11 Dec 2004 04:53:24 -0000 1.9
+++ consoleappender.cpp 17 Dec 2004 01:36:04 -0000 1.10
@@ -33,13 +33,14 @@
}
ConsoleAppender::ConsoleAppender(const LayoutPtr& layout)
- : WriterAppender(layout), useErr(false),
- target(getSystemOut())
+ : WriterAppender(layout),
+ target(getSystemOut()),
+ useErr(false)
{
}
ConsoleAppender::ConsoleAppender(const LayoutPtr& layout, const LogString&
target)
- : WriterAppender(layout), target(getSystemOut())
+ : WriterAppender(layout), target(getSystemOut()), useErr(false)
{
setTarget(target);
activateOptions(NULL);
1.8 +1 -1 logging-log4cxx/src/cyclicbuffer.cpp
Index: cyclicbuffer.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/cyclicbuffer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cyclicbuffer.cpp 25 Oct 2004 04:44:03 -0000 1.7
+++ cyclicbuffer.cpp 17 Dec 2004 01:36:04 -0000 1.8
@@ -29,7 +29,7 @@
@param maxSize The maximum number of elements in the buffer.
*/
CyclicBuffer::CyclicBuffer(int maxSize)
-: maxSize(maxSize), first(0), last(0), numElems(0), ea(maxSize)
+: ea(maxSize), first(0), last(0), numElems(0), maxSize(maxSize)
{
if(maxSize < 1)
{
1.4 +2 -2 logging-log4cxx/src/datagrampacket.cpp
Index: datagrampacket.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/datagrampacket.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- datagrampacket.cpp 22 Oct 2004 17:35:30 -0000 1.3
+++ datagrampacket.cpp 17 Dec 2004 01:36:04 -0000 1.4
@@ -23,7 +23,7 @@
/** Constructs a DatagramPacket for receiving packets of length
<code>length</code>. */
DatagramPacket::DatagramPacket(void * buf, int length)
-: buf(buf), offset(0), length(length), port(0), address()
+: buf(buf), offset(0), length(length), address(), port(0)
{
}
@@ -39,7 +39,7 @@
/** Constructs a DatagramPacket for receiving packets of length
<code>length</code>, specifying an offset into the buffer. */
DatagramPacket::DatagramPacket(void * buf, int offset, int length)
-: buf(buf), offset(offset), length(length), port(0), address()
+: buf(buf), offset(offset), length(length), address(), port(0)
{
}
/** Constructs a datagram packet for sending packets of length
1.14 +3 -3 logging-log4cxx/src/datagramsocket.cpp
Index: datagramsocket.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/datagramsocket.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- datagramsocket.cpp 11 Dec 2004 04:53:24 -0000 1.13
+++ datagramsocket.cpp 17 Dec 2004 01:36:04 -0000 1.14
@@ -40,13 +40,13 @@
IMPLEMENT_LOG4CXX_OBJECT(DatagramSocket);
DatagramSocket::DatagramSocket()
- : fd(0), port(0), localPort(0), address(), localAddress()
+ : fd(0), address(), localAddress(), port(0), localPort(0)
{
create();
}
DatagramSocket::DatagramSocket(int localPort)
- : fd(0), port(0), localPort(0), address(), localAddress()
+ : fd(0), address(), localAddress(), port(0), localPort(0)
{
InetAddress bindAddr;
bindAddr.address = INADDR_ANY;
@@ -56,7 +56,7 @@
}
DatagramSocket::DatagramSocket(int localPort, InetAddress localAddress)
- : fd(0), port(0), localPort(0), address(), localAddress()
+ : fd(0), address(), localAddress(), port(0), localPort(0)
{
create();
bind(localPort, localAddress);
1.13 +1 -1 logging-log4cxx/src/datelayout.cpp
Index: datelayout.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/datelayout.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- datelayout.cpp 11 Dec 2004 04:53:24 -0000 1.12
+++ datelayout.cpp 17 Dec 2004 01:36:04 -0000 1.13
@@ -29,7 +29,7 @@
using namespace log4cxx::spi;
DateLayout::DateLayout(const LogString& dateFormatOption) :
- dateFormat(0), timeZoneID(), dateFormatOption(dateFormatOption)
+ timeZoneID(), dateFormatOption(dateFormatOption), dateFormat(0)
{
}
1.5 +5 -3 logging-log4cxx/src/file.cpp
Index: file.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/file.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- file.cpp 16 Dec 2004 00:21:46 -0000 1.4
+++ file.cpp 17 Dec 2004 01:36:04 -0000 1.5
@@ -19,6 +19,7 @@
#include <apr_file_info.h>
#include <log4cxx/helpers/transcoder.h>
#include <log4cxx/helpers/pool.h>
+#include <assert.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -28,18 +29,18 @@
#if defined(LOG4CXX_LOGCHAR_IS_WCHAR)
File::File(const std::string& name)
- : mbcsName(name) {
+ : internalName(), mbcsName(name) {
Transcoder::decode(name, internalName);
}
File::File(const std::wstring& name)
- : internalName(name) {
+ : internalName(name), mbcsName() {
Transcoder::encode(name, mbcsName);
}
#endif
File::File(const File& src)
- : mbcsName(mbcsName), internalName(internalName) {
+ : internalName(internalName), mbcsName(mbcsName) {
}
File& File::operator=(const File& src) {
@@ -158,6 +159,7 @@
size_t len = encoded.length();
rv = apr_file_write(f, encoded.data(), &len);
apr_status_t close = apr_file_close(f);
+ assert(close == APR_SUCCESS);
}
return rv;
}
1.16 +9 -10 logging-log4cxx/src/fileappender.cpp
Index: fileappender.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/fileappender.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fileappender.cpp 15 Dec 2004 08:10:39 -0000 1.15
+++ fileappender.cpp 17 Dec 2004 01:36:04 -0000 1.16
@@ -30,30 +30,30 @@
IMPLEMENT_LOG4CXX_OBJECT(FileAppender)
FileAppender::FileAppender()
-: fileAppend(true), bufferedIO(false), bufferSize(8*1024),
- fileName(), ofs(NULL), fileClosed(1)
+: fileAppend(true), fileName(), bufferedIO(false), bufferSize(8*1024),
+ ofs(NULL), fileClosed(1)
{
}
FileAppender::FileAppender(const LayoutPtr& layout, const File& fileName,
bool append, bool bufferedIO, int bufferSize)
-: fileAppend(append), bufferedIO(bufferedIO), bufferSize(bufferSize),
- fileName(fileName), ofs(NULL), fileClosed(1)
+: fileAppend(append), fileName(fileName), bufferedIO(bufferedIO),
bufferSize(bufferSize),
+ ofs(NULL), fileClosed(1)
{
this->layout = layout;
}
FileAppender::FileAppender(const LayoutPtr& layout, const File& fileName,
bool append)
-: fileAppend(append), bufferedIO(false), bufferSize(8*1024),
- fileName(fileName), ofs(NULL), fileClosed(1)
+: fileAppend(append), fileName(fileName), bufferedIO(false),
bufferSize(8*1024),
+ ofs(NULL), fileClosed(1)
{
this->layout = layout;
}
FileAppender::FileAppender(const LayoutPtr& layout, const File& fileName)
-: fileAppend(true), bufferedIO(false), bufferSize(8*1024),
- fileName(fileName), ofs(NULL), fileClosed(1)
+: fileAppend(true), fileName(fileName), bufferedIO(false),
bufferSize(8*1024),
+ ofs(NULL), fileClosed(1)
{
this->layout = layout;
}
@@ -146,8 +146,7 @@
flags |= APR_BUFFERED;
}
ofs = NULL;
- apr_status_t rv = apr_file_open(&ofs,
- fileName.getMBCSName().c_str(), flags, perm, p);
+ fileName.open(&ofs, flags, perm, p);
fileClosed = 0;
}
if (ofs != NULL) {
1.12 +1 -1 logging-log4cxx/src/filewatchdog.cpp
Index: filewatchdog.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/filewatchdog.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- filewatchdog.cpp 11 Dec 2004 04:53:25 -0000 1.11
+++ filewatchdog.cpp 17 Dec 2004 01:36:04 -0000 1.12
@@ -35,7 +35,7 @@
long FileWatchdog::DEFAULT_DELAY = 60000;
FileWatchdog::FileWatchdog(const File& file)
- : file(file), lastModif(0), delay(DEFAULT_DELAY),
+ : file(file), delay(DEFAULT_DELAY), lastModif(0),
warnedAlready(false), interrupted(0), thread()
{
}
1.6 +4 -5 logging-log4cxx/src/locationinfo.cpp
Index: locationinfo.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/locationinfo.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- locationinfo.cpp 16 Dec 2004 19:41:03 -0000 1.5
+++ locationinfo.cpp 17 Dec 2004 01:36:04 -0000 1.6
@@ -59,11 +59,10 @@
* @param src source location
*/
LocationInfo::LocationInfo( const LocationInfo & src )
- : fileName( src.fileName ),
- className( src.className ),
- methodName( src.methodName ),
- lineNumber( src.lineNumber )
- {
+ : lineNumber( src.lineNumber ),
+ fileName( src.fileName ),
+ className( src.className ),
+ methodName( src.methodName ) {
}
/**
1.21 +16 -15 logging-log4cxx/src/loggingevent.cpp
Index: loggingevent.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/loggingevent.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- loggingevent.cpp 16 Dec 2004 00:21:46 -0000 1.20
+++ loggingevent.cpp 17 Dec 2004 01:36:04 -0000 1.21
@@ -39,29 +39,30 @@
//
// Accessor for start time.
-// Called from LogManager::getRepositorySelector
-// to initialize APR and set "start" time.
//
log4cxx_time_t LoggingEvent::getStartTime() {
- log4cxx::helpers::APRInitializer::initialize();
- static apr_time_t startTime(apr_time_now());
- return startTime;
+ return log4cxx::helpers::APRInitializer::initialize();
}
-LoggingEvent::LoggingEvent()
-: timeStamp(0), ndcLookupRequired(true), locationInfo(),
-mdcCopyLookupRequired(true), properties(0)
-{
+LoggingEvent::LoggingEvent() :
+ properties(0),
+ ndcLookupRequired(true),
+ mdcCopyLookupRequired(true),
+ timeStamp(0),
+ locationInfo() {
}
LoggingEvent::LoggingEvent(
const LoggerPtr& logger, const LevelPtr& level,
- const LogString& message, const LocationInfo& locationInfo)
-: logger(logger), level(level),
-message(message), locationInfo(locationInfo),
-timeStamp(apr_time_now()), ndcLookupRequired(true),
-mdcCopyLookupRequired(true), properties(0)
-{
+ const LogString& message, const LocationInfo& locationInfo) :
+ logger(logger),
+ level(level),
+ properties(0),
+ ndcLookupRequired(true),
+ mdcCopyLookupRequired(true),
+ message(message),
+ timeStamp(apr_time_now()),
+ locationInfo(locationInfo) {
apr_os_thread_t thread = apr_os_thread_current();
threadId = (unsigned long) thread;
}
1.19 +2 -1 logging-log4cxx/src/logmanager.cpp
Index: logmanager.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/logmanager.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- logmanager.cpp 16 Dec 2004 06:41:15 -0000 1.18
+++ logmanager.cpp 17 Dec 2004 01:36:04 -0000 1.19
@@ -32,6 +32,7 @@
#include <log4cxx/spi/loggingevent.h>
#include <log4cxx/file.h>
#include <log4cxx/helpers/transcoder.h>
+#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx;
using namespace log4cxx::spi;
@@ -47,7 +48,7 @@
//
// call to initialize APR and trigger "start" of logging clock
//
- static log4cxx_time_t tm = LoggingEvent::getStartTime();
+ APRInitializer::initialize();
static spi::RepositorySelectorPtr selector;
return selector;
}
1.20 +5 -8 logging-log4cxx/src/optionconverter.cpp
Index: optionconverter.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/optionconverter.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- optionconverter.cpp 11 Dec 2004 04:53:25 -0000 1.19
+++ optionconverter.cpp 17 Dec 2004 01:36:04 -0000 1.20
@@ -72,7 +72,6 @@
LogString OptionConverter::convertSpecialChars(const LogString& s)
{
logchar c;
- int len = s.length();
LogString sbuf;
LogString::const_iterator i = s.begin();
@@ -280,7 +279,7 @@
{
size_t hashIndex = value.find(LOG4CXX_STR("#"));
- if (hashIndex == -1)
+ if (hashIndex == LogString::npos)
{
if (value.empty())
{
@@ -288,16 +287,14 @@
}
else
{
- LogLog::debug(
- ((LogString)
LOG4CXX_STR("OptionConverter::toLevel: no class name specified, level=["))
- + value
- +LOG4CXX_STR("]"));
+ LogLog::debug(
+ ((LogString) LOG4CXX_STR("OptionConverter::toLevel: no class
name specified, level=["))
+ + value
+ +LOG4CXX_STR("]"));
// no class name specified : use standard Level class
return Level::toLevel(value, defaultValue);
}
}
-
- const LevelPtr& result = defaultValue;
LogString clazz = value.substr(hashIndex + 1);
LogString levelName = value.substr(0, hashIndex);
1.12 +4 -4 logging-log4cxx/src/patternconverter.cpp
Index: patternconverter.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/patternconverter.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- patternconverter.cpp 11 Dec 2004 04:53:25 -0000 1.11
+++ patternconverter.cpp 17 Dec 2004 01:36:04 -0000 1.12
@@ -22,14 +22,14 @@
IMPLEMENT_LOG4CXX_OBJECT(PatternConverter)
-PatternConverter::PatternConverter() : minChar(-1), maxChar(0x7FFFFFFF),
- leftAlign(false), next(), os()
+PatternConverter::PatternConverter() : next(), minChar(-1),
maxChar(0x7FFFFFFF),
+ leftAlign(false),os()
{
}
PatternConverter::PatternConverter(const FormattingInfo& fi)
- : minChar(fi.minChar), maxChar(fi.maxChar), leftAlign(fi.leftAlign),
- next(), os()
+ : next(), minChar(fi.minChar), maxChar(fi.maxChar),
leftAlign(fi.leftAlign),
+ os()
{
}
1.7 +2 -2 logging-log4cxx/src/simpledateformat.cpp
Index: simpledateformat.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/simpledateformat.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- simpledateformat.cpp 16 Dec 2004 00:21:46 -0000 1.6
+++ simpledateformat.cpp 17 Dec 2004 01:36:04 -0000 1.7
@@ -80,7 +80,7 @@
class NumericToken : public SimpleDateFormat::PatternToken {
public:
- NumericToken(int width)
+ NumericToken(size_t width)
: width(width) {
}
@@ -98,7 +98,7 @@
}
private:
- int width;
+ size_t width;
char zeroDigit;
};
1.15 +2 -2 logging-log4cxx/src/sockethubappender.cpp
Index: sockethubappender.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/sockethubappender.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sockethubappender.cpp 11 Dec 2004 04:53:25 -0000 1.14
+++ sockethubappender.cpp 17 Dec 2004 01:36:04 -0000 1.15
@@ -41,12 +41,12 @@
}
SocketHubAppender::SocketHubAppender()
- : port(DEFAULT_PORT), locationInfo(false), oosList(), thread()
+ : port(DEFAULT_PORT), oosList(), locationInfo(false), thread()
{
}
SocketHubAppender::SocketHubAppender(int port)
- : port(port), locationInfo(false), oosList(), thread()
+ : port(port), oosList(), locationInfo(false), thread()
{
startServer();
}
1.20 +1 -1 logging-log4cxx/src/socketimpl.cpp
Index: socketimpl.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/socketimpl.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- socketimpl.cpp 11 Dec 2004 04:53:25 -0000 1.19
+++ socketimpl.cpp 17 Dec 2004 01:36:04 -0000 1.20
@@ -164,7 +164,7 @@
-SocketImpl::SocketImpl() : fd(0), localport(-1), port(0), timeout(-1),
address()
+SocketImpl::SocketImpl() : address(), fd(0), localport(-1), port(0),
timeout(-1)
{
}
1.12 +2 -2 logging-log4cxx/src/socketinputstream.cpp
Index: socketinputstream.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/socketinputstream.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- socketinputstream.cpp 16 Dec 2004 06:41:16 -0000 1.11
+++ socketinputstream.cpp 17 Dec 2004 01:36:04 -0000 1.12
@@ -28,14 +28,14 @@
SocketInputStream::SocketInputStream(SocketPtr socket)
: socket(socket), bufferSize(DEFAULT_BUFFER_SIZE),
-currentPos(0), maxPos(0), memBuffer()
+ memBuffer(), currentPos(0), maxPos(0)
{
// memBuffer = new unsigned char[bufferSize];
}
SocketInputStream::SocketInputStream(SocketPtr socket, size_t bufferSize)
: socket(socket), bufferSize(bufferSize),
-currentPos(0), maxPos(0), memBuffer()
+ memBuffer(), currentPos(0), maxPos(0)
{
// memBuffer = new unsigned char[bufferSize];
}
1.10 +2 -2 logging-log4cxx/src/socketnode.cpp
Index: socketnode.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/socketnode.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- socketnode.cpp 11 Dec 2004 04:53:25 -0000 1.9
+++ socketnode.cpp 17 Dec 2004 01:36:04 -0000 1.10
@@ -32,8 +32,8 @@
SocketNode::SocketNode(helpers::SocketPtr& socket,
spi::LoggerRepositoryPtr& hierarchy)
- : hierarchy(hierarchy),
- is(socket->getInputStream())
+ : is(socket->getInputStream()),
+ hierarchy(hierarchy)
{
}
1.2 +11 -11 logging-log4cxx/src/synchronized.cpp
Index: synchronized.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/synchronized.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synchronized.cpp 25 Nov 2004 05:18:58 -0000 1.1
+++ synchronized.cpp 17 Dec 2004 01:36:04 -0000 1.2
@@ -14,24 +14,24 @@
* limitations under the License.
*/
-#include <log4cxx/helpers/synchronized.h>
-#include <log4cxx/helpers/mutex.h>
+#include <log4cxx/helpers/synchronized.h>
+#include <log4cxx/helpers/mutex.h>
-#include <apr_thread_mutex.h>
+#include <apr_thread_mutex.h>
using namespace log4cxx::helpers;
using namespace log4cxx;
-synchronized::synchronized(apr_thread_mutex_t* mutex)
+synchronized::synchronized(apr_thread_mutex_t* mutex)
: mutex(mutex)
-{
- apr_status_t stat = apr_thread_mutex_lock(mutex);
- if (stat != APR_SUCCESS) {
- throw MutexException(stat);
- }
+{
+ apr_status_t stat = apr_thread_mutex_lock(mutex);
+ if (stat != APR_SUCCESS) {
+ throw MutexException(stat);
+ }
}
synchronized::~synchronized()
-{
- apr_status_t stat = apr_thread_mutex_unlock(mutex);
+{
+ apr_thread_mutex_unlock(mutex);
}
1.13 +3 -3 logging-log4cxx/src/telnetappender.cpp
Index: telnetappender.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/telnetappender.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- telnetappender.cpp 11 Dec 2004 04:53:25 -0000 1.12
+++ telnetappender.cpp 17 Dec 2004 01:36:04 -0000 1.13
@@ -35,10 +35,10 @@
TelnetAppender::TelnetAppender()
: port(23),
- sh(),
connections(20),
- activeConnections(0),
- serverSocket(NULL)
+ serverSocket(NULL),
+ sh(),
+ activeConnections(0)
{
}
1.10 +1 -1 logging-log4cxx/src/timezone.cpp
Index: timezone.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/timezone.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- timezone.cpp 16 Dec 2004 00:21:46 -0000 1.9
+++ timezone.cpp 17 Dec 2004 01:36:04 -0000 1.10
@@ -152,7 +152,7 @@
LogString off( id.substr( 4 ) );
if ( id.length() >= 7 )
{
- int colonPos = off.find( LOG4CXX_STR(':') );
+ size_t colonPos = off.find( LOG4CXX_STR(':') );
if ( colonPos == LogString::npos )
{
minutes = StringHelper::toInt(off.substr(off.length() - 2));
1.6 +1 -1 logging-log4cxx/src/transcoder.cpp
Index: transcoder.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/transcoder.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- transcoder.cpp 15 Dec 2004 08:10:39 -0000 1.5
+++ transcoder.cpp 17 Dec 2004 01:36:04 -0000 1.6
@@ -79,7 +79,7 @@
//
// if not enough space then return length so far
//
- if(mblen > (destEnd - current)) {
+ if(current + mblen > destEnd) {
return current - dest;
}
//
