Author: afester
Date: Mon Jul 10 12:32:10 2006
New Revision: 420619
URL: http://svn.apache.org/viewvc?rev=420619&view=rev
Log:
LOGCXX-14: next part for fix of "declaration of ‘local’ shadows a member of
'this'" when compiling with g++ -Wshadow
Modified:
logging/log4cxx/trunk/src/appenderskeleton.cpp
logging/log4cxx/trunk/src/asyncappender.cpp
logging/log4cxx/trunk/src/bufferedwriter.cpp
logging/log4cxx/trunk/src/bytebuffer.cpp
logging/log4cxx/trunk/src/cacheddateformat.cpp
logging/log4cxx/trunk/src/consoleappender.cpp
logging/log4cxx/trunk/src/cyclicbuffer.cpp
logging/log4cxx/trunk/src/dailyrollingfileappender.cpp
logging/log4cxx/trunk/src/datagrampacket.cpp
logging/log4cxx/trunk/src/datagramsocket.cpp
logging/log4cxx/trunk/src/datelayout.cpp
logging/log4cxx/trunk/src/domconfigurator.cpp
logging/log4cxx/trunk/src/exception.cpp
logging/log4cxx/trunk/src/fallbackerrorhandler.cpp
logging/log4cxx/trunk/src/file.cpp
logging/log4cxx/trunk/src/fileappender.cpp
logging/log4cxx/trunk/src/filerenameaction.cpp
logging/log4cxx/trunk/src/filewatchdog.cpp
logging/log4cxx/trunk/src/fixedwindowrollingpolicy.cpp
logging/log4cxx/trunk/src/formattinginfo.cpp
logging/log4cxx/trunk/src/inetaddress.cpp
logging/log4cxx/trunk/src/inputstreamreader.cpp
logging/log4cxx/trunk/src/integer.cpp
logging/log4cxx/trunk/src/level.cpp
logging/log4cxx/trunk/src/levelmatchfilter.cpp
logging/log4cxx/trunk/src/literalpatternconverter.cpp
Modified: logging/log4cxx/trunk/src/appenderskeleton.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/appenderskeleton.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/appenderskeleton.cpp (original)
+++ logging/log4cxx/trunk/src/appenderskeleton.cpp Mon Jul 10 12:32:10 2006
@@ -41,8 +41,8 @@
{
}
-AppenderSkeleton::AppenderSkeleton(const LayoutPtr& layout)
-: layout(layout),
+AppenderSkeleton::AppenderSkeleton(const LayoutPtr& layout1)
+: layout(layout1),
name(),
threshold(Level::getAll()),
errorHandler(new OnlyOnceErrorHandler()),
@@ -125,11 +125,11 @@
append(event, pool);
}
-void AppenderSkeleton::setErrorHandler(const spi::ErrorHandlerPtr&
errorHandler)
+void AppenderSkeleton::setErrorHandler(const spi::ErrorHandlerPtr&
errorHandler1)
{
synchronized sync(mutex);
- if(errorHandler == 0)
+ if(errorHandler1 == 0)
{
// We do not throw exception here since the cause is probably a
// bad config file.
@@ -137,13 +137,13 @@
}
else
{
- this->errorHandler = errorHandler;
+ this->errorHandler = errorHandler1;
}
}
-void AppenderSkeleton::setThreshold(const LevelPtr& threshold)
+void AppenderSkeleton::setThreshold(const LevelPtr& threshold1)
{
- this->threshold = threshold;
+ this->threshold = threshold1;
}
void AppenderSkeleton::setOption(const LogString& option,
Modified: logging/log4cxx/trunk/src/asyncappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/asyncappender.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/asyncappender.cpp (original)
+++ logging/log4cxx/trunk/src/asyncappender.cpp Mon Jul 10 12:32:10 2006
@@ -125,10 +125,10 @@
return aai->getAllAppenders();
}
-AppenderPtr AsyncAppender::getAppender(const LogString& name) const
+AppenderPtr AsyncAppender::getAppender(const LogString& name1) const
{
synchronized sync(aai->getMutex());
- return aai->getAppender(name);
+ return aai->getAppender(name1);
}
bool AsyncAppender::isAttached(const AppenderPtr& appender) const
@@ -137,12 +137,12 @@
return aai->isAttached(appender);
}
-void AsyncAppender::setBufferSize(int size)
+void AsyncAppender::setBufferSize(int size1)
{
- if (size < 0) {
+ if (size1 < 0) {
throw IllegalArgumentException("size argument must be non-negative");
}
- this->size = size;
+ this->size = size1;
}
int AsyncAppender::getBufferSize() const
Modified: logging/log4cxx/trunk/src/bufferedwriter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/bufferedwriter.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/bufferedwriter.cpp (original)
+++ logging/log4cxx/trunk/src/bufferedwriter.cpp Mon Jul 10 12:32:10 2006
@@ -22,12 +22,12 @@
IMPLEMENT_LOG4CXX_OBJECT(BufferedWriter)
-BufferedWriter::BufferedWriter(WriterPtr& out)
- : out(out), sz(1024) {
+BufferedWriter::BufferedWriter(WriterPtr& out1)
+ : out(out1), sz(1024) {
}
-BufferedWriter::BufferedWriter(WriterPtr& out, size_t sz)
- : out(out), sz(sz) {
+BufferedWriter::BufferedWriter(WriterPtr& out1, size_t sz1)
+ : out(out1), sz(sz1) {
}
BufferedWriter::~BufferedWriter() {
Modified: logging/log4cxx/trunk/src/bytebuffer.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/bytebuffer.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/bytebuffer.cpp (original)
+++ logging/log4cxx/trunk/src/bytebuffer.cpp Mon Jul 10 12:32:10 2006
@@ -22,8 +22,8 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-ByteBuffer::ByteBuffer(char* data, size_t capacity)
- : base(data), cap(capacity), lim(capacity), pos(0) {
+ByteBuffer::ByteBuffer(char* data1, size_t capacity)
+ : base(data1), pos(0), lim(capacity), cap(capacity) {
}
ByteBuffer::~ByteBuffer() {
Modified: logging/log4cxx/trunk/src/cacheddateformat.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/cacheddateformat.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/cacheddateformat.cpp (original)
+++ logging/log4cxx/trunk/src/cacheddateformat.cpp Mon Jul 10 12:32:10 2006
@@ -66,17 +66,17 @@
* caching or 1 to only use cache for duplicate requests.
*/
CachedDateFormat::CachedDateFormat(const DateFormatPtr& dateFormat,
- int expiration) :
+ int expiration1) :
formatter(dateFormat),
millisecondStart(0),
slotBegin(std::numeric_limits<log4cxx_time_t>::min()),
cache(50, LOG4CXX_STR(' ')),
- expiration(expiration),
+ expiration(expiration1),
previousTime(std::numeric_limits<log4cxx_time_t>::min()) {
if (dateFormat == NULL) {
throw IllegalArgumentException("dateFormat cannot be null");
}
- if (expiration < 0) {
+ if (expiration1 < 0) {
throw IllegalArgumentException("expiration must be non-negative");
}
}
Modified: logging/log4cxx/trunk/src/consoleappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/consoleappender.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/consoleappender.cpp (original)
+++ logging/log4cxx/trunk/src/consoleappender.cpp Mon Jul 10 12:32:10 2006
@@ -31,21 +31,21 @@
{
}
-ConsoleAppender::ConsoleAppender(const LayoutPtr& layout)
+ConsoleAppender::ConsoleAppender(const LayoutPtr& layout1)
:target(getSystemOut())
{
- setLayout(layout);
+ setLayout(layout1);
WriterPtr wr(createWriter(getSystemOut()));
setWriter(wr);
Pool p;
WriterAppender::activateOptions(p);
}
-ConsoleAppender::ConsoleAppender(const LayoutPtr& layout, const LogString&
target)
- : target(target)
+ConsoleAppender::ConsoleAppender(const LayoutPtr& layout1, const LogString&
target1)
+ : target(target1)
{
- setLayout(layout);
- WriterPtr wr(createWriter(target));
+ setLayout(layout1);
+ WriterPtr wr(createWriter(target1));
setWriter(wr);
Pool p;
WriterAppender::activateOptions(p);
@@ -113,14 +113,14 @@
if(StringHelper::equalsIgnoreCase(target,
LOG4CXX_STR("SYSTEM.OUT"), LOG4CXX_STR("system.out")))
{
- WriterPtr writer(new SystemOutWriter());
- setWriter(writer);
+ WriterPtr writer1(new SystemOutWriter());
+ setWriter(writer1);
}
else if (StringHelper::equalsIgnoreCase(target,
LOG4CXX_STR("SYSTEM.ERR"), LOG4CXX_STR("system.err")))
{
- WriterPtr writer(new SystemErrWriter());
- setWriter(writer);
+ WriterPtr writer1(new SystemErrWriter());
+ setWriter(writer1);
}
WriterAppender::activateOptions(p);
}
Modified: logging/log4cxx/trunk/src/cyclicbuffer.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/cyclicbuffer.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/cyclicbuffer.cpp (original)
+++ logging/log4cxx/trunk/src/cyclicbuffer.cpp Mon Jul 10 12:32:10 2006
@@ -30,14 +30,14 @@
The <code>maxSize</code> argument must a positive integer.
@param maxSize The maximum number of elements in the buffer.
*/
-CyclicBuffer::CyclicBuffer(int maxSize)
-: ea(maxSize), first(0), last(0), numElems(0), maxSize(maxSize)
+CyclicBuffer::CyclicBuffer(int maxSize1)
+: ea(maxSize1), first(0), last(0), numElems(0), maxSize(maxSize1)
{
- if(maxSize < 1)
+ if(maxSize1 < 1)
{
std::string msg("The maxSize argument (");
Pool p;
- StringHelper::toString(maxSize, p, msg);
+ StringHelper::toString(maxSize1, p, msg);
msg.append(") is not a positive integer.");
throw IllegalArgumentException(msg);
}
Modified: logging/log4cxx/trunk/src/dailyrollingfileappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/dailyrollingfileappender.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/dailyrollingfileappender.cpp (original)
+++ logging/log4cxx/trunk/src/dailyrollingfileappender.cpp Mon Jul 10 12:32:10
2006
@@ -39,9 +39,9 @@
DailyRollingFileAppender::DailyRollingFileAppender(
const LayoutPtr& layout,
const LogString& filename,
- const LogString& datePattern)
- : rfa(new log4cxx::rolling::RollingFileAppender()),
- datePattern(datePattern) {
+ const LogString& datePattern1)
+ : datePattern(datePattern1),
+ rfa(new log4cxx::rolling::RollingFileAppender()) {
rfa->setLayout(layout);
rfa->setFile(filename);
Pool p;
Modified: logging/log4cxx/trunk/src/datagrampacket.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/datagrampacket.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/datagrampacket.cpp (original)
+++ logging/log4cxx/trunk/src/datagrampacket.cpp Mon Jul 10 12:32:10 2006
@@ -23,32 +23,32 @@
/** Constructs a DatagramPacket for receiving packets of length
<code>length</code>. */
-DatagramPacket::DatagramPacket(void * buf, int length)
-: buf(buf), offset(0), length(length), address(), port(0)
+DatagramPacket::DatagramPacket(void * buf1, int length1)
+: buf(buf1), offset(0), length(length1), address(), port(0)
{
}
/** Constructs a datagram packet for sending packets of length
<code>length/<code> to the specified port number on the specified
host. */
-DatagramPacket::DatagramPacket(void * buf, int length, InetAddressPtr address,
-int port)
-: buf(buf), offset(0), length(length), address(address), port(port)
+DatagramPacket::DatagramPacket(void * buf1, int length1, InetAddressPtr
address1,
+int port1)
+: buf(buf1), offset(0), length(length1), address(address1), port(port1)
{
}
/** 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), address(), port(0)
+DatagramPacket::DatagramPacket(void * buf1, int offset1, int length1)
+: buf(buf1), offset(offset1), length(length1), address(), port(0)
{
}
/** Constructs a datagram packet for sending packets of length
<code>length</code> with offset <code>offset</code> to the
specified port number on the specified host. */
-DatagramPacket::DatagramPacket(void * buf, int offset, int length,
-InetAddressPtr address, int port)
-: buf(buf), offset(offset), length(length), address(address), port(port)
+DatagramPacket::DatagramPacket(void * buf1, int offset1, int length1,
+InetAddressPtr address1, int port1)
+: buf(buf1), offset(offset1), length(length1), address(address1), port(port1)
{
}
Modified: logging/log4cxx/trunk/src/datagramsocket.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/datagramsocket.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/datagramsocket.cpp (original)
+++ logging/log4cxx/trunk/src/datagramsocket.cpp Mon Jul 10 12:32:10 2006
@@ -33,20 +33,20 @@
create();
}
-DatagramSocket::DatagramSocket(int localPort)
+DatagramSocket::DatagramSocket(int localPort1)
: socket(0), address(), localAddress(), port(0), localPort(0)
{
InetAddressPtr bindAddr = InetAddress::anyAddress();
create();
- bind(localPort, bindAddr);
+ bind(localPort1, bindAddr);
}
-DatagramSocket::DatagramSocket(int localPort, InetAddressPtr localAddress)
+DatagramSocket::DatagramSocket(int localPort1, InetAddressPtr localAddress1)
: socket(0), address(), localAddress(), port(0), localPort(0)
{
create();
- bind(localPort, localAddress);
+ bind(localPort1, localAddress1);
}
DatagramSocket::~DatagramSocket()
@@ -61,16 +61,16 @@
}
/** Binds a datagram socket to a local port and address.*/
-void DatagramSocket::bind(int localPort, InetAddressPtr localAddress)
+void DatagramSocket::bind(int localPort1, InetAddressPtr localAddress1)
{
Pool addrPool;
// Create server socket address (including port number)
- LOG4CXX_ENCODE_CHAR(hostAddr, localAddress->getHostAddress());
+ LOG4CXX_ENCODE_CHAR(hostAddr, localAddress1->getHostAddress());
apr_sockaddr_t *server_addr;
- apr_status_t status =
+ apr_status_t status =
apr_sockaddr_info_get(&server_addr, hostAddr.c_str(), APR_INET,
- localPort, 0, (apr_pool_t*)
addrPool.getAPRPool());
+ localPort1, 0, (apr_pool_t*)
addrPool.getAPRPool());
if (status != APR_SUCCESS) {
throw BindException(status);
}
@@ -81,8 +81,8 @@
throw BindException(status);
}
- this->localPort = localPort;
- this->localAddress = localAddress;
+ this->localPort = localPort1;
+ this->localAddress = localAddress1;
}
/** Close the socket.*/
@@ -100,18 +100,18 @@
}
}
-void DatagramSocket::connect(InetAddressPtr address, int port)
+void DatagramSocket::connect(InetAddressPtr address1, int port1)
{
- this->address = address;
- this->port = port;
+ this->address = address1;
+ this->port = port1;
Pool addrPool;
// create socket address
- LOG4CXX_ENCODE_CHAR(hostAddr, address->getHostAddress());
+ LOG4CXX_ENCODE_CHAR(hostAddr, address1->getHostAddress());
apr_sockaddr_t *client_addr;
- apr_status_t status =
+ apr_status_t status =
apr_sockaddr_info_get(&client_addr, hostAddr.c_str(), APR_INET,
port, 0, (apr_pool_t*) addrPool.getAPRPool());
if (status != APR_SUCCESS) {
@@ -130,7 +130,7 @@
{
apr_socket_t* newSocket;
apr_status_t status =
- apr_socket_create(&newSocket, APR_INET, SOCK_DGRAM,
+ apr_socket_create(&newSocket, APR_INET, SOCK_DGRAM,
APR_PROTO_UDP, (apr_pool_t*) socketPool.getAPRPool());
socket = newSocket;
if (status != APR_SUCCESS) {
Modified: logging/log4cxx/trunk/src/datelayout.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/datelayout.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/datelayout.cpp (original)
+++ logging/log4cxx/trunk/src/datelayout.cpp Mon Jul 10 12:32:10 2006
@@ -28,8 +28,8 @@
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-DateLayout::DateLayout(const LogString& dateFormatOption) :
- timeZoneID(), dateFormatOption(dateFormatOption), dateFormat(0)
+DateLayout::DateLayout(const LogString& dateFormatOption1) :
+ timeZoneID(), dateFormatOption(dateFormatOption1), dateFormat(0)
{
}
Modified: logging/log4cxx/trunk/src/domconfigurator.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/domconfigurator.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/domconfigurator.cpp (original)
+++ logging/log4cxx/trunk/src/domconfigurator.cpp Mon Jul 10 12:32:10 2006
@@ -651,10 +651,10 @@
propSetter.setProperty(name, value, p);
}
-void DOMConfigurator::doConfigure(const File& filename,
spi::LoggerRepositoryPtr& repository)
+void DOMConfigurator::doConfigure(const File& filename,
spi::LoggerRepositoryPtr& repository1)
{
- repository->setConfigured(true);
- this->repository = repository;
+ repository1->setConfigured(true);
+ this->repository = repository1;
LogString msg(LOG4CXX_STR("DOMConfigurator configuring file "));
msg.append(filename.getName());
msg.append(LOG4CXX_STR("..."));
@@ -667,10 +667,10 @@
log4cxx_status_t rv = filename.open(&fd, APR_READ, APR_OS_DEFAULT, p);
if (rv != APR_SUCCESS) {
- LogString msg(LOG4CXX_STR("Could not open file ["));
- msg.append(filename.getName());
- msg.append(LOG4CXX_STR("]."));
- LogLog::error(msg);
+ LogString msg2(LOG4CXX_STR("Could not open file ["));
+ msg2.append(filename.getName());
+ msg2.append(LOG4CXX_STR("]."));
+ LogLog::error(msg2);
} else {
apr_xml_parser *parser;
apr_xml_doc *doc;
@@ -678,16 +678,16 @@
if (rv != APR_SUCCESS) {
char errbuf[2000];
char errbufXML[2000];
- LogString msg(LOG4CXX_STR("Error parsing file ["));
- msg.append(filename.getName());
- msg.append(LOG4CXX_STR("], "));
+ LogString msg2(LOG4CXX_STR("Error parsing file ["));
+ msg2.append(filename.getName());
+ msg2.append(LOG4CXX_STR("], "));
apr_strerror(rv, errbuf, sizeof(errbuf));
LOG4CXX_DECODE_CHAR(lerrbuf, std::string(errbuf));
apr_xml_parser_geterror(parser, errbufXML, sizeof(errbufXML));
LOG4CXX_DECODE_CHAR(lerrbufXML, std::string(errbufXML));
- msg.append(lerrbuf);
- msg.append(lerrbufXML);
- LogLog::error(msg);
+ msg2.append(lerrbuf);
+ msg2.append(lerrbufXML);
+ LogLog::error(msg2);
} else {
AppenderMap appenders;
parse(doc->root, doc, appenders);
Modified: logging/log4cxx/trunk/src/exception.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/exception.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/exception.cpp (original)
+++ logging/log4cxx/trunk/src/exception.cpp Mon Jul 10 12:32:10 2006
@@ -46,8 +46,8 @@
}
-RuntimeException::RuntimeException(const std::string& msg)
- : Exception(msg) {
+RuntimeException::RuntimeException(const std::string& msg1)
+ : Exception(msg1) {
}
RuntimeException::RuntimeException(const RuntimeException& src)
@@ -59,8 +59,8 @@
return *this;
}
-NullPointerException::NullPointerException(const std::string& msg)
- : RuntimeException(msg) {
+NullPointerException::NullPointerException(const std::string& msg1)
+ : RuntimeException(msg1) {
}
NullPointerException::NullPointerException(const NullPointerException& src)
@@ -72,8 +72,8 @@
return *this;
}
-IllegalArgumentException::IllegalArgumentException(const std::string& msg)
- : RuntimeException(msg) {
+IllegalArgumentException::IllegalArgumentException(const std::string& msg1)
+ : RuntimeException(msg1) {
}
IllegalArgumentException::IllegalArgumentException(const
IllegalArgumentException& src)
@@ -94,8 +94,8 @@
}
-IOException::IOException(const std::string& msg)
- : Exception(msg) {
+IOException::IOException(const std::string& msg1)
+ : Exception(msg1) {
}
IOException::IOException(const IOException& src)
@@ -232,8 +232,8 @@
return s;
}
-IllegalMonitorStateException::IllegalMonitorStateException(const std::string&
msg)
- : Exception(msg) {
+IllegalMonitorStateException::IllegalMonitorStateException(const std::string&
msg1)
+ : Exception(msg1) {
}
IllegalMonitorStateException::IllegalMonitorStateException(const
IllegalMonitorStateException& src)
@@ -245,8 +245,8 @@
return *this;
}
-InstantiationException::InstantiationException(const std::string& msg)
- : Exception(msg) {
+InstantiationException::InstantiationException(const std::string& msg1)
+ : Exception(msg1) {
}
InstantiationException::InstantiationException(const InstantiationException&
src)
Modified: logging/log4cxx/trunk/src/fallbackerrorhandler.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/fallbackerrorhandler.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/fallbackerrorhandler.cpp (original)
+++ logging/log4cxx/trunk/src/fallbackerrorhandler.cpp Mon Jul 10 12:32:10 2006
@@ -73,18 +73,18 @@
}
}
-void FallbackErrorHandler::setAppender(const AppenderPtr& primary)
+void FallbackErrorHandler::setAppender(const AppenderPtr& primary1)
{
LogLog::debug(((LogString) LOG4CXX_STR("FB: Setting primary appender
to ["))
- + primary->getName() + LOG4CXX_STR("]."));
- this->primary = primary;
+ + primary1->getName() + LOG4CXX_STR("]."));
+ this->primary = primary1;
}
-void FallbackErrorHandler::setBackupAppender(const AppenderPtr& backup)
+void FallbackErrorHandler::setBackupAppender(const AppenderPtr& backup1)
{
LogLog::debug(((LogString) LOG4CXX_STR("FB: Setting backup appender to
["))
- + backup->getName() + LOG4CXX_STR("]."));
- this->backup = backup;
+ + backup1->getName() + LOG4CXX_STR("]."));
+ this->backup = backup1;
}
void FallbackErrorHandler::activateOptions(Pool&)
Modified: logging/log4cxx/trunk/src/file.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/file.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/file.cpp (original)
+++ logging/log4cxx/trunk/src/file.cpp Mon Jul 10 12:32:10 2006
@@ -29,16 +29,16 @@
File::File() {
}
-File::File(const std::string& name)
+File::File(const std::string& name1)
: name(), osName() {
- Transcoder::decode(name, this->name);
+ Transcoder::decode(name1, this->name);
Transcoder::encode(this->name, osName);
}
#if LOG4CXX_HAS_WCHAR_T
-File::File(const std::wstring& name)
+File::File(const std::wstring& name1)
: name(), osName() {
- Transcoder::decode(name, this->name);
+ Transcoder::decode(name1, this->name);
Transcoder::encode(this->name, osName);
}
#endif
Modified: logging/log4cxx/trunk/src/fileappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/fileappender.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/fileappender.cpp (original)
+++ logging/log4cxx/trunk/src/fileappender.cpp Mon Jul 10 12:32:10 2006
@@ -39,26 +39,26 @@
{
}
-FileAppender::FileAppender(const LayoutPtr& layout, const LogString& fileName,
- bool append, bool bufferedIO, int bufferSize)
-: WriterAppender(layout), fileAppend(append), fileName(fileName),
bufferedIO(bufferedIO), bufferSize(bufferSize),
+FileAppender::FileAppender(const LayoutPtr& layout1, const LogString&
fileName1,
+ bool append1, bool bufferedIO1, int bufferSize1)
+: WriterAppender(layout1), fileAppend(append1), fileName(fileName1),
bufferedIO(bufferedIO1), bufferSize(bufferSize1),
fileClosed(1)
{
Pool p;
activateOptions(p);
}
-FileAppender::FileAppender(const LayoutPtr& layout, const LogString& fileName,
- bool append)
-: WriterAppender(layout), fileAppend(append), fileName(fileName),
bufferedIO(false), bufferSize(8*1024),
+FileAppender::FileAppender(const LayoutPtr& layout1, const LogString&
fileName1,
+ bool append1)
+: WriterAppender(layout1), fileAppend(append1), fileName(fileName1),
bufferedIO(false), bufferSize(8*1024),
fileClosed(1)
{
Pool p;
activateOptions(p);
}
-FileAppender::FileAppender(const LayoutPtr& layout, const LogString& fileName)
-: WriterAppender(layout), fileAppend(true), fileName(fileName),
+FileAppender::FileAppender(const LayoutPtr& layout1, const LogString&
fileName1)
+: WriterAppender(layout1), fileAppend(true), fileName(fileName1),
bufferedIO(false), bufferSize(8*1024), fileClosed(1)
{
Pool p;
@@ -76,10 +76,10 @@
-void FileAppender::setBufferedIO(bool bufferedIO)
+void FileAppender::setBufferedIO(bool bufferedIO1)
{
- this->bufferedIO = bufferedIO;
- if(bufferedIO)
+ this->bufferedIO = bufferedIO1;
+ if(bufferedIO1)
{
setImmediateFlush(false);
}
@@ -202,14 +202,14 @@
*/
void FileAppender::setFile(
const LogString& filename,
- bool append,
- bool bufferedIO,
- size_t bufferSize,
+ bool append1,
+ bool bufferedIO1,
+ size_t bufferSize1,
Pool& p) {
synchronized sync(mutex);
// It does not make sense to have immediate flush and bufferedIO.
- if (bufferedIO) {
+ if (bufferedIO1) {
setImmediateFlush(false);
}
@@ -221,7 +221,7 @@
//
// don't want to write a byte order mark if the file exists
//
- if (append) {
+ if (append1) {
File outFile(filename);
writeBOM = !outFile.exists(p);
} else {
@@ -229,7 +229,7 @@
}
}
- OutputStreamPtr outStream(new FileOutputStream(filename, append));
+ OutputStreamPtr outStream(new FileOutputStream(filename, append1));
//
// if a new file and UTF-16, then write a BOM
//
@@ -241,15 +241,15 @@
WriterPtr newWriter(createWriter(outStream));
- if (bufferedIO) {
- newWriter = new BufferedWriter(newWriter, bufferSize);
+ if (bufferedIO1) {
+ newWriter = new BufferedWriter(newWriter, bufferSize1);
}
setWriter(newWriter);
- this->fileAppend = append;
- this->bufferedIO = bufferedIO;
+ this->fileAppend = append1;
+ this->bufferedIO = bufferedIO1;
this->fileName = filename;
- this->bufferSize = bufferSize;
+ this->bufferSize = bufferSize1;
writeHeader(p);
}
Modified: logging/log4cxx/trunk/src/filerenameaction.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/filerenameaction.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/filerenameaction.cpp (original)
+++ logging/log4cxx/trunk/src/filerenameaction.cpp Mon Jul 10 12:32:10 2006
@@ -25,8 +25,8 @@
FileRenameAction::FileRenameAction(const File& toRename,
const File& renameTo,
- bool renameEmptyFile)
- : source(toRename), destination(renameTo), renameEmptyFile(renameEmptyFile)
{
+ bool renameEmptyFile1)
+ : source(toRename), destination(renameTo),
renameEmptyFile(renameEmptyFile1) {
}
bool FileRenameAction::execute(log4cxx::helpers::Pool& pool) const {
Modified: logging/log4cxx/trunk/src/filewatchdog.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/filewatchdog.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/filewatchdog.cpp (original)
+++ logging/log4cxx/trunk/src/filewatchdog.cpp Mon Jul 10 12:32:10 2006
@@ -31,8 +31,8 @@
long FileWatchdog::DEFAULT_DELAY = 60000;
-FileWatchdog::FileWatchdog(const File& file)
- : file(file), delay(DEFAULT_DELAY), lastModif(0),
+FileWatchdog::FileWatchdog(const File& file1)
+ : file(file1), delay(DEFAULT_DELAY), lastModif(0),
warnedAlready(false), interrupted(0), thread()
{
}
@@ -43,8 +43,8 @@
void FileWatchdog::checkAndConfigure()
{
- Pool pool;
- if (!file.exists(pool))
+ Pool pool1;
+ if (!file.exists(pool1))
{
if(!warnedAlready)
{
@@ -56,7 +56,7 @@
}
else
{
- apr_time_t thisMod = file.lastModified(pool);
+ apr_time_t thisMod = file.lastModified(pool1);
if (thisMod > lastModif)
{
lastModif = thisMod;
Modified: logging/log4cxx/trunk/src/fixedwindowrollingpolicy.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/fixedwindowrollingpolicy.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/fixedwindowrollingpolicy.cpp (original)
+++ logging/log4cxx/trunk/src/fixedwindowrollingpolicy.cpp Mon Jul 10 12:32:10
2006
@@ -37,12 +37,12 @@
minIndex(1), maxIndex(7) {
}
-void FixedWindowRollingPolicy::setMaxIndex(int maxIndex) {
- this->maxIndex = maxIndex;
+void FixedWindowRollingPolicy::setMaxIndex(int maxIndex1) {
+ this->maxIndex = maxIndex1;
}
-void FixedWindowRollingPolicy::setMinIndex(int minIndex) {
- this->minIndex = minIndex;
+void FixedWindowRollingPolicy::setMinIndex(int minIndex1) {
+ this->minIndex = minIndex1;
}
Modified: logging/log4cxx/trunk/src/formattinginfo.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/formattinginfo.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/formattinginfo.cpp (original)
+++ logging/log4cxx/trunk/src/formattinginfo.cpp Mon Jul 10 12:32:10 2006
@@ -18,10 +18,10 @@
#include <log4cxx/pattern/formattinginfo.h>
#include <limits.h>
- using namespace log4cxx;
- using namespace log4cxx::pattern;
+using namespace log4cxx;
+using namespace log4cxx::pattern;
- IMPLEMENT_LOG4CXX_OBJECT(FormattingInfo)
+IMPLEMENT_LOG4CXX_OBJECT(FormattingInfo)
/**
* Creates new instance.
@@ -30,10 +30,10 @@
* @param maxLength maximum length.
*/
FormattingInfo::FormattingInfo(
- const bool leftAlign, const int minLength, const int maxLength) :
- leftAlign(leftAlign),
- minLength(minLength),
- maxLength(maxLength) {
+ const bool leftAlign1, const int minLength1, const int maxLength1) :
+ minLength(minLength1),
+ maxLength(maxLength1),
+ leftAlign(leftAlign1) {
}
/**
Modified: logging/log4cxx/trunk/src/inetaddress.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/inetaddress.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/inetaddress.cpp (original)
+++ logging/log4cxx/trunk/src/inetaddress.cpp Mon Jul 10 12:32:10 2006
@@ -27,8 +27,8 @@
IMPLEMENT_LOG4CXX_OBJECT(InetAddress)
-UnknownHostException::UnknownHostException(const std::string& msg)
- : Exception(msg) {
+UnknownHostException::UnknownHostException(const std::string& msg1)
+ : Exception(msg1) {
}
UnknownHostException::UnknownHostException(const UnknownHostException& src)
Modified: logging/log4cxx/trunk/src/inputstreamreader.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/inputstreamreader.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/inputstreamreader.cpp (original)
+++ logging/log4cxx/trunk/src/inputstreamreader.cpp Mon Jul 10 12:32:10 2006
@@ -25,19 +25,19 @@
IMPLEMENT_LOG4CXX_OBJECT(InputStreamReader)
-InputStreamReader::InputStreamReader(const InputStreamPtr& in)
- : in(in), dec(CharsetDecoder::getDefaultDecoder()) {
- if (in == 0) {
+InputStreamReader::InputStreamReader(const InputStreamPtr& in1)
+ : in(in1), dec(CharsetDecoder::getDefaultDecoder()) {
+ if (in1 == 0) {
throw NullPointerException("in parameter may not be null.");
}
}
-InputStreamReader::InputStreamReader(const InputStreamPtr& in, const
CharsetDecoderPtr &dec)
- : in(in), dec(dec) {
- if (in == 0) {
+InputStreamReader::InputStreamReader(const InputStreamPtr& in1, const
CharsetDecoderPtr &dec1)
+ : in(in1), dec(dec1) {
+ if (in1 == 0) {
throw NullPointerException("in parameter may not be null.");
}
- if (dec == 0) {
+ if (dec1 == 0) {
throw NullPointerException("dec parameter may not be null.");
}
}
Modified: logging/log4cxx/trunk/src/integer.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/integer.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/integer.cpp (original)
+++ logging/log4cxx/trunk/src/integer.cpp Mon Jul 10 12:32:10 2006
@@ -26,7 +26,7 @@
Integer::Integer() : val(0){
}
-Integer::Integer(int val) : val(val) {
+Integer::Integer(int val1) : val(val1) {
}
Integer::~Integer() {
Modified: logging/log4cxx/trunk/src/level.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/level.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/level.cpp (original)
+++ logging/log4cxx/trunk/src/level.cpp Mon Jul 10 12:32:10 2006
@@ -62,9 +62,9 @@
-Level::Level(int level,
- const logchar* name, int syslogEquivalent)
-: level(level), name(name), syslogEquivalent(syslogEquivalent)
+Level::Level(int level1,
+ const logchar* name1, int syslogEquivalent1)
+: level(level1), name(name1), syslogEquivalent(syslogEquivalent1)
{
APRInitializer::initialize();
}
@@ -178,14 +178,14 @@
}
#endif
-bool Level::equals(const LevelPtr& level) const
+bool Level::equals(const LevelPtr& level1) const
{
- return (this->level == level->level);
+ return (this->level == level1->level);
}
-bool Level::isGreaterOrEqual(const LevelPtr& level) const
+bool Level::isGreaterOrEqual(const LevelPtr& level1) const
{
- return this->level >= level->level;
+ return this->level >= level1->level;
}
void Level::toString(std::string& str) const {
Modified: logging/log4cxx/trunk/src/levelmatchfilter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/levelmatchfilter.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/levelmatchfilter.cpp (original)
+++ logging/log4cxx/trunk/src/levelmatchfilter.cpp Mon Jul 10 12:32:10 2006
@@ -51,9 +51,9 @@
}
}
-void LevelMatchFilter::setLevelToMatch(const LogString& levelToMatch)
+void LevelMatchFilter::setLevelToMatch(const LogString& levelToMatch1)
{
- this->levelToMatch = OptionConverter::toLevel(levelToMatch,
this->levelToMatch);
+ this->levelToMatch = OptionConverter::toLevel(levelToMatch1,
this->levelToMatch);
}
const LogString& LevelMatchFilter::getLevelToMatch() const
Modified: logging/log4cxx/trunk/src/literalpatternconverter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/literalpatternconverter.cpp?rev=420619&r1=420618&r2=420619&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/literalpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/literalpatternconverter.cpp Mon Jul 10 12:32:10
2006
@@ -20,39 +20,39 @@
#include <log4cxx/spi/location/locationinfo.h>
- using namespace log4cxx;
- using namespace log4cxx::pattern;
- using namespace log4cxx::spi;
- using namespace log4cxx::helpers;
+using namespace log4cxx;
+using namespace log4cxx::pattern;
+using namespace log4cxx::spi;
+using namespace log4cxx::helpers;
- IMPLEMENT_LOG4CXX_OBJECT(LiteralPatternConverter)
+IMPLEMENT_LOG4CXX_OBJECT(LiteralPatternConverter)
- LiteralPatternConverter::LiteralPatternConverter(const LogString& literal) :
-
LoggingEventPatternConverter(LOG4CXX_STR("Literal"),LOG4CXX_STR("literal")),
- literal(literal) {
- }
+LiteralPatternConverter::LiteralPatternConverter(const LogString& literal1) :
+ LoggingEventPatternConverter(LOG4CXX_STR("Literal"),LOG4CXX_STR("literal")),
+ literal(literal1) {
+}
- PatternConverterPtr LiteralPatternConverter::newInstance(
- const LogString& literal) {
- if (literal.length() == 1 && literal[0] == LOG4CXX_STR(' ')) {
- static PatternConverterPtr blank(new LiteralPatternConverter(literal));
- return blank;
- }
- PatternConverterPtr pattern(new LiteralPatternConverter(literal));
- return pattern;
- }
+PatternConverterPtr LiteralPatternConverter::newInstance(
+ const LogString& literal) {
+ if (literal.length() == 1 && literal[0] == LOG4CXX_STR(' ')) {
+ static PatternConverterPtr blank(new LiteralPatternConverter(literal));
+ return blank;
+ }
+ PatternConverterPtr pattern(new LiteralPatternConverter(literal));
+ return pattern;
+}
- void LiteralPatternConverter::format(
- const LoggingEventPtr& event,
- LogString& toAppendTo,
- Pool& p) const {
- toAppendTo.append(literal);
- }
+void LiteralPatternConverter::format(
+ const LoggingEventPtr& event,
+ LogString& toAppendTo,
+ Pool& p) const {
+ toAppendTo.append(literal);
+ }
- void LiteralPatternConverter::format(
- const ObjectPtr& event,
- LogString& toAppendTo,
- Pool& p) const {
- toAppendTo.append(literal);
- }
+void LiteralPatternConverter::format(
+ const ObjectPtr& event,
+ LogString& toAppendTo,
+ Pool& p) const {
+ toAppendTo.append(literal);
+ }
