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 ca...@apache.org on 2008/05/07 05:03:25 UTC
svn commit: r653968 - in /logging/log4cxx/trunk/src: main/cpp/ test/cpp/
Author: carnold
Date: Tue May 6 20:03:25 2008
New Revision: 653968
URL: http://svn.apache.org/viewvc?rev=653968&view=rev
Log:
LOGCXX-267: Local variables hide member variables
Modified:
logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp
logging/log4cxx/trunk/src/main/cpp/gzcompressaction.cpp
logging/log4cxx/trunk/src/main/cpp/logstream.cpp
logging/log4cxx/trunk/src/main/cpp/obsoleterollingfileappender.cpp
logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp
logging/log4cxx/trunk/src/main/cpp/socket.cpp
logging/log4cxx/trunk/src/main/cpp/zipcompressaction.cpp
logging/log4cxx/trunk/src/test/cpp/logunit.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp?rev=653968&r1=653967&r2=653968&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp Tue May 6 20:03:25 2008
@@ -210,10 +210,10 @@
return appenders->getAllAppenders();
}
-AppenderPtr AsyncAppender::getAppender(const LogString& name) const
+AppenderPtr AsyncAppender::getAppender(const LogString& n) const
{
synchronized sync(appenders->getMutex());
- return appenders->getAppender(name);
+ return appenders->getAppender(n);
}
bool AsyncAppender::isAttached(const AppenderPtr& appender) const
@@ -238,10 +238,10 @@
appenders->removeAppender(appender);
}
-void AsyncAppender::removeAppender(const LogString& name)
+void AsyncAppender::removeAppender(const LogString& n)
{
synchronized sync(appenders->getMutex());
- appenders->removeAppender(name);
+ appenders->removeAppender(n);
}
bool AsyncAppender::getLocationInfo() const {
Modified: logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp?rev=653968&r1=653967&r2=653968&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp Tue May 6 20:03:25 2008
@@ -47,15 +47,15 @@
activateOptions(p);
}
-void DailyRollingFileAppender::setDatePattern(const LogString& pattern) {
- datePattern = pattern;
+void DailyRollingFileAppender::setDatePattern(const LogString& newPattern) {
+ datePattern = newPattern;
}
LogString DailyRollingFileAppender::getDatePattern() {
return datePattern;
}
-void DailyRollingFileAppender::activateOptions(log4cxx::helpers::Pool& pool) {
+void DailyRollingFileAppender::activateOptions(log4cxx::helpers::Pool& p) {
TimeBasedRollingPolicyPtr policy = new TimeBasedRollingPolicy();
LogString pattern(getFile());
bool inLiteral = false;
@@ -85,11 +85,11 @@
}
policy->setFileNamePattern(pattern);
- policy->activateOptions(pool);
+ policy->activateOptions(p);
setTriggeringPolicy(policy);
setRollingPolicy(policy);
- RollingFileAppenderSkeleton::activateOptions(pool);
+ RollingFileAppenderSkeleton::activateOptions(p);
}
Modified: logging/log4cxx/trunk/src/main/cpp/gzcompressaction.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/gzcompressaction.cpp?rev=653968&r1=653967&r2=653968&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/gzcompressaction.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/gzcompressaction.cpp Tue May 6 20:03:25 2008
@@ -35,9 +35,9 @@
bool GZCompressAction::execute(log4cxx::helpers::Pool& p) const {
if (source.exists(p)) {
- apr_pool_t* pool = p.getAPRPool();
+ apr_pool_t* aprpool = p.getAPRPool();
apr_procattr_t* attr;
- apr_status_t stat = apr_procattr_create(&attr, pool);
+ apr_status_t stat = apr_procattr_create(&attr, aprpool);
if (stat != APR_SUCCESS) throw IOException(stat);
stat = apr_procattr_io_set(attr, APR_NO_PIPE, APR_FULL_BLOCK, APR_FULL_BLOCK);
@@ -62,14 +62,14 @@
// redirect the child's error stream to this processes' error stream
//
apr_file_t* child_err;
- stat = apr_file_open_stderr(&child_err, pool);
+ stat = apr_file_open_stderr(&child_err, aprpool);
if (stat == APR_SUCCESS) {
stat = apr_procattr_child_err_set(attr, child_err, NULL);
if (stat != APR_SUCCESS) throw IOException(stat);
}
const char** args = (const char**)
- apr_palloc(pool, 4 *sizeof(*args));
+ apr_palloc(aprpool, 4 *sizeof(*args));
int i = 0;
args[i++] = "gzip";
args[i++] = "-c";
@@ -78,7 +78,7 @@
apr_proc_t pid;
- stat = apr_proc_create(&pid, "gzip", args, NULL, attr, pool);
+ stat = apr_proc_create(&pid, "gzip", args, NULL, attr, aprpool);
if (stat != APR_SUCCESS) throw IOException(stat);
apr_proc_wait(&pid, NULL, NULL, APR_WAIT);
Modified: logging/log4cxx/trunk/src/main/cpp/logstream.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logstream.cpp?rev=653968&r1=653967&r2=653968&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/logstream.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logstream.cpp Tue May 6 20:03:25 2008
@@ -165,8 +165,8 @@
}
}
-bool logstream_base::isEnabledFor(const ::log4cxx::LevelPtr& level) const {
- return logger->isEnabledFor(level);
+bool logstream_base::isEnabledFor(const ::log4cxx::LevelPtr& l) const {
+ return logger->isEnabledFor(l);
}
@@ -200,8 +200,8 @@
return *this;
}
-logstream& logstream::operator<<(const LevelPtr& level) {
- setLevel(level);
+logstream& logstream::operator<<(const LevelPtr& l) {
+ setLevel(l);
return *this;
}
@@ -228,13 +228,13 @@
return *stream;
}
-void logstream::log(LoggerPtr& logger,
- const LevelPtr& level,
- const log4cxx::spi::LocationInfo& location) {
+void logstream::log(LoggerPtr& log,
+ const LevelPtr& lev,
+ const log4cxx::spi::LocationInfo& loc) {
if (stream != 0) {
std::basic_string<Ch> msg = stream->str();
if (!msg.empty()) {
- logger->log(level, msg, location);
+ log->log(lev, msg, loc);
}
}
}
@@ -269,9 +269,9 @@
void logstream::refresh_stream_state() {
if (stream != 0) {
- int fillchar;
- if(logstream_base::set_stream_state(*stream, fillchar)) {
- stream->fill(fillchar);
+ int ch;
+ if(logstream_base::set_stream_state(*stream, ch)) {
+ stream->fill(ch);
}
}
}
@@ -333,13 +333,13 @@
return *stream;
}
-void wlogstream::log(LoggerPtr& logger,
- const LevelPtr& level,
- const log4cxx::spi::LocationInfo& location) {
+void wlogstream::log(LoggerPtr& log,
+ const LevelPtr& lev,
+ const log4cxx::spi::LocationInfo& loc) {
if (stream != 0) {
std::basic_string<Ch> msg = stream->str();
if (!msg.empty()) {
- logger->log(level, msg, location);
+ log->log(lev, msg, loc);
}
}
}
@@ -374,9 +374,9 @@
void wlogstream::refresh_stream_state() {
if (stream != 0) {
- int fillchar;
- if(logstream_base::set_stream_state(*stream, fillchar)) {
- stream->fill(fillchar);
+ int ch;
+ if(logstream_base::set_stream_state(*stream, ch)) {
+ stream->fill(ch);
}
}
}
Modified: logging/log4cxx/trunk/src/main/cpp/obsoleterollingfileappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/obsoleterollingfileappender.cpp?rev=653968&r1=653967&r2=653968&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/obsoleterollingfileappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/obsoleterollingfileappender.cpp Tue May 6 20:03:25 2008
@@ -71,17 +71,17 @@
setLayout(layout);
setFile(filename);
setAppend(append);
- Pool pool;
- activateOptions(pool);
+ Pool p;
+ activateOptions(p);
}
-RollingFileAppender::RollingFileAppender(const LayoutPtr& layout,
+RollingFileAppender::RollingFileAppender(const LayoutPtr& newLayout,
const LogString& filename)
: maxFileSize(10*1024*1024), maxBackupIndex(1) {
- setLayout(layout);
+ setLayout(newLayout);
setFile(filename);
- Pool pool;
- activateOptions(pool);
+ Pool p;
+ activateOptions(p);
}
RollingFileAppender::~RollingFileAppender() {
@@ -133,11 +133,11 @@
maxFileSize = OptionConverter::toFileSize(value, maxFileSize + 1);
}
-void RollingFileAppender::activateOptions(Pool& pool) {
+void RollingFileAppender::activateOptions(Pool& p) {
log4cxx::rolling::SizeBasedTriggeringPolicyPtr trigger(
new log4cxx::rolling::SizeBasedTriggeringPolicy());
trigger->setMaxFileSize(maxFileSize);
- trigger->activateOptions(pool);
+ trigger->activateOptions(p);
setTriggeringPolicy(trigger);
log4cxx::rolling::FixedWindowRollingPolicyPtr rolling(
@@ -145,11 +145,11 @@
rolling->setMinIndex(1);
rolling->setMaxIndex(maxBackupIndex);
rolling->setFileNamePattern(getFile() + LOG4CXX_STR(".%i"));
- rolling->activateOptions(pool);
+ rolling->activateOptions(p);
setRollingPolicy(rolling);
using namespace log4cxx::rolling;
- RollingFileAppenderSkeleton::activateOptions(pool);
+ RollingFileAppenderSkeleton::activateOptions(p);
}
Modified: logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp?rev=653968&r1=653967&r2=653968&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp Tue May 6 20:03:25 2008
@@ -653,10 +653,10 @@
oldest events are deleted as new events are added to the
buffer. By default the size of the cyclic buffer is 512 events.
*/
-void SMTPAppender::setBufferSize(int bufferSize)
+void SMTPAppender::setBufferSize(int sz)
{
- this->bufferSize = bufferSize;
- cb.resize(bufferSize);
+ this->bufferSize = sz;
+ cb.resize(sz);
}
/**
Modified: logging/log4cxx/trunk/src/main/cpp/socket.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/socket.cpp?rev=653968&r1=653967&r2=653968&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/socket.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/socket.cpp Tue May 6 20:03:25 2008
@@ -29,7 +29,7 @@
/** Creates a stream socket and connects it to the specified port
number at the specified IP address.
*/
-Socket::Socket(InetAddressPtr& address, int port) : pool(), socket(0), address(address), port(port)
+Socket::Socket(InetAddressPtr& addr, int prt) : pool(), socket(0), address(addr), port(prt)
{
apr_status_t status =
apr_socket_create(&socket, APR_INET, SOCK_STREAM,
@@ -38,13 +38,13 @@
throw SocketException(status);
}
- LOG4CXX_ENCODE_CHAR(host, address->getHostAddress());
+ LOG4CXX_ENCODE_CHAR(host, addr->getHostAddress());
// create socket address (including port)
apr_sockaddr_t *client_addr;
status =
apr_sockaddr_info_get(&client_addr, host.c_str(), APR_INET,
- port, 0, pool.getAPRPool());
+ prt, 0, pool.getAPRPool());
if (status != APR_SUCCESS) {
throw ConnectException(status);
}
@@ -56,10 +56,10 @@
}
}
-Socket::Socket(apr_socket_t* socket, apr_pool_t* pool) :
- pool(pool, true), socket(socket) {
+Socket::Socket(apr_socket_t* s, apr_pool_t* p) :
+ pool(p, true), socket(s) {
apr_sockaddr_t* sa;
- apr_status_t status = apr_socket_addr_get(&sa, APR_REMOTE, socket);
+ apr_status_t status = apr_socket_addr_get(&sa, APR_REMOTE, s);
if (status == APR_SUCCESS) {
port = sa->port;
LogString remotename;
Modified: logging/log4cxx/trunk/src/main/cpp/zipcompressaction.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/zipcompressaction.cpp?rev=653968&r1=653967&r2=653968&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/zipcompressaction.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/zipcompressaction.cpp Tue May 6 20:03:25 2008
@@ -35,9 +35,9 @@
bool ZipCompressAction::execute(log4cxx::helpers::Pool& p) const {
if (source.exists(p)) {
- apr_pool_t* pool = p.getAPRPool();
+ apr_pool_t* aprpool = p.getAPRPool();
apr_procattr_t* attr;
- apr_status_t stat = apr_procattr_create(&attr, pool);
+ apr_status_t stat = apr_procattr_create(&attr, aprpool);
if (stat != APR_SUCCESS) throw IOException(stat);
stat = apr_procattr_io_set(attr, APR_NO_PIPE, APR_NO_PIPE, APR_FULL_BLOCK);
@@ -51,17 +51,17 @@
// redirect the child's error stream to this processes' error stream
//
apr_file_t* child_err;
- stat = apr_file_open_stderr(&child_err, pool);
+ stat = apr_file_open_stderr(&child_err, aprpool);
if (stat == APR_SUCCESS) {
stat = apr_procattr_child_err_set(attr, child_err, NULL);
if (stat != APR_SUCCESS) throw IOException(stat);
}
const char** args = (const char**)
- apr_palloc(pool, 5 *sizeof(*args));
+ apr_palloc(aprpool, 5 *sizeof(*args));
int i = 0;
args[i++] = "zip";
- args[i++] = "-q";
+ args[i++] = "-q";
args[i++] = Transcoder::encode(destination.getPath(), p);
args[i++] = Transcoder::encode(source.getPath(), p);
args[i++] = NULL;
@@ -71,7 +71,7 @@
}
apr_proc_t pid;
- stat = apr_proc_create(&pid, "zip", args, NULL, attr, pool);
+ stat = apr_proc_create(&pid, "zip", args, NULL, attr, aprpool);
if (stat != APR_SUCCESS) throw IOException(stat);
apr_proc_wait(&pid, NULL, NULL, APR_WAIT);
Modified: logging/log4cxx/trunk/src/test/cpp/logunit.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/logunit.cpp?rev=653968&r1=653967&r2=653968&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/logunit.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/logunit.cpp Tue May 6 20:03:25 2008
@@ -115,8 +115,8 @@
TestFixture::TestFixture() : tc(0) {}
TestFixture::~TestFixture() {}
-void TestFixture::setCase(abts_case* tc) {
- this->tc = tc;
+void TestFixture::setCase(abts_case* newtc) {
+ tc = newtc;
}
void TestFixture::setUp() {}
void TestFixture::tearDown() {}