Author: afester
Date: Mon Jul 17 10:54:21 2006
New Revision: 422771
URL: http://svn.apache.org/viewvc?rev=422771&view=rev
Log:
LOGCXX-14: last part for fix of "declaration of ‘local’ shadows a member of
'this'" when compiling with g++ -Wshadow
Modified:
logging/log4cxx/trunk/src/locale.cpp
logging/log4cxx/trunk/src/locationinfo.cpp
logging/log4cxx/trunk/src/logger.cpp
logging/log4cxx/trunk/src/loggingevent.cpp
logging/log4cxx/trunk/src/loggingeventpatternconverter.cpp
logging/log4cxx/trunk/src/loglog.cpp
logging/log4cxx/trunk/src/logmanager.cpp
logging/log4cxx/trunk/src/mdc.cpp
logging/log4cxx/trunk/src/nameabbreviator.cpp
logging/log4cxx/trunk/src/namepatternconverter.cpp
logging/log4cxx/trunk/src/ndc.cpp
logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp
logging/log4cxx/trunk/src/outputstreamwriter.cpp
logging/log4cxx/trunk/src/patternconverter.cpp
logging/log4cxx/trunk/src/pool.cpp
logging/log4cxx/trunk/src/propertiespatternconverter.cpp
logging/log4cxx/trunk/src/propertysetter.cpp
logging/log4cxx/trunk/src/rollingfileappender.cpp
logging/log4cxx/trunk/src/rolloverdescription.cpp
logging/log4cxx/trunk/src/rootcategory.cpp
logging/log4cxx/trunk/src/socketappender.cpp
logging/log4cxx/trunk/src/socketappenderskeleton.cpp
logging/log4cxx/trunk/src/sockethubappender.cpp
logging/log4cxx/trunk/src/socketimpl.cpp
logging/log4cxx/trunk/src/socketinputstream.cpp
logging/log4cxx/trunk/src/socketnode.cpp
logging/log4cxx/trunk/src/socketoutputstream.cpp
logging/log4cxx/trunk/src/stringtokenizer.cpp
logging/log4cxx/trunk/src/synchronized.cpp
logging/log4cxx/trunk/src/syslogappender.cpp
logging/log4cxx/trunk/src/syslogwriter.cpp
logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp
logging/log4cxx/trunk/src/timezone.cpp
logging/log4cxx/trunk/src/writerappender.cpp
logging/log4cxx/trunk/src/xmlsocketappender.cpp
Modified: logging/log4cxx/trunk/src/locale.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/locale.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/locale.cpp (original)
+++ logging/log4cxx/trunk/src/locale.cpp Mon Jul 17 10:54:21 2006
@@ -20,19 +20,19 @@
using namespace log4cxx::helpers;
-Locale::Locale(const LogString& language)
- : language(language)
+Locale::Locale(const LogString& language1)
+ : language(language1)
{
}
-Locale::Locale(const LogString& language, const LogString& country)
- : language(language), country(country)
+Locale::Locale(const LogString& language1, const LogString& country1)
+ : language(language1), country(country1)
{
}
-Locale::Locale(const LogString& language, const LogString& country,
- const LogString& variant)
-: language(language), country(country), variant(variant)
+Locale::Locale(const LogString& language1, const LogString& country1,
+ const LogString& variant1)
+: language(language1), country(country1), variant(variant1)
{
}
Modified: logging/log4cxx/trunk/src/locationinfo.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/locationinfo.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/locationinfo.cpp (original)
+++ logging/log4cxx/trunk/src/locationinfo.cpp Mon Jul 17 10:54:21 2006
@@ -17,7 +17,8 @@
#include <log4cxx/spi/location/locationinfo.h>
#include <sstream>
- using namespace ::log4cxx::spi;
+using namespace ::log4cxx::spi;
+
/**
When location information is not available the constant
<code>NA</code> is returned. Current value of this string
@@ -35,12 +36,12 @@
* @remarks Used by LOG4CXX_LOCATION to generate
* location info for current code site
*/
- LocationInfo::LocationInfo( const char * const fileName,
- const char * const methodName,
- int lineNumber )
- : lineNumber( lineNumber ),
- fileName( fileName ),
- methodName( methodName ) {
+ LocationInfo::LocationInfo( const char * const fileName1,
+ const char * const methodName1,
+ int lineNumber1 )
+ : lineNumber( lineNumber1 ),
+ fileName( fileName1 ),
+ methodName( methodName1 ) {
}
/**
Modified: logging/log4cxx/trunk/src/logger.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/logger.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/logger.cpp (original)
+++ logging/log4cxx/trunk/src/logger.cpp Mon Jul 17 10:54:21 2006
@@ -37,8 +37,8 @@
IMPLEMENT_LOG4CXX_OBJECT(Logger)
-Logger::Logger(const LogString& name)
-: name(name), level(), parent(), resourceBundle(),
+Logger::Logger(const LogString& name1)
+: name(name1), level(), parent(), resourceBundle(),
repository(0), aai(), additive(true), mutex()
{
}
@@ -101,41 +101,41 @@
}
-void Logger::forcedLog(const LevelPtr& level, const std::string& message,
+void Logger::forcedLog(const LevelPtr& level1, const std::string& message,
const LocationInfo& location)
{
Pool p;
LOG4CXX_DECODE_CHAR(msg, message);
- LoggingEventPtr event(new LoggingEvent(this, level, msg, location));
+ LoggingEventPtr event(new LoggingEvent(this, level1, msg, location));
callAppenders(event, p);
}
#if LOG4CXX_HAS_WCHAR_T
-void Logger::forcedLog(const LevelPtr& level, const std::wstring& message,
+void Logger::forcedLog(const LevelPtr& level1, const std::wstring& message,
const LocationInfo& location)
{
Pool p;
LOG4CXX_DECODE_WCHAR(msg, message);
- LoggingEventPtr event(new LoggingEvent(this, level, msg, location));
+ LoggingEventPtr event(new LoggingEvent(this, level1, msg, location));
callAppenders(event, p);
}
#endif
-void Logger::forcedLog(const LevelPtr& level, const std::string& message)
+void Logger::forcedLog(const LevelPtr& level1, const std::string& message)
{
Pool p;
LOG4CXX_DECODE_CHAR(msg, message);
- LoggingEventPtr event(new LoggingEvent(this, level, msg,
+ LoggingEventPtr event(new LoggingEvent(this, level1, msg,
LocationInfo::getLocationUnavailable()));
callAppenders(event, p);
}
#if LOG4CXX_HAS_WCHAR_T
-void Logger::forcedLog(const LevelPtr& level, const std::wstring& message)
+void Logger::forcedLog(const LevelPtr& level1, const std::wstring& message)
{
Pool p;
LOG4CXX_DECODE_WCHAR(msg, message);
- LoggingEventPtr event(new LoggingEvent(this, level, msg,
+ LoggingEventPtr event(new LoggingEvent(this, level1, msg,
LocationInfo::getLocationUnavailable()));
callAppenders(event, p);
}
@@ -161,16 +161,16 @@
}
}
-AppenderPtr Logger::getAppender(const LogString& name) const
+AppenderPtr Logger::getAppender(const LogString& name1) const
{
synchronized sync(mutex);
- if (aai == 0 || name.empty())
+ if (aai == 0 || name1.empty())
{
return 0;
}
- return aai->getAppender(name);
+ return aai->getAppender(name1);
}
const LevelPtr& Logger::getEffectiveLevel() const
@@ -271,14 +271,14 @@
return Level::getDebug()->isGreaterOrEqual(getEffectiveLevel());
}
-bool Logger::isEnabledFor(const LevelPtr& level) const
+bool Logger::isEnabledFor(const LevelPtr& level1) const
{
- if(repository == 0 || repository->isDisabled(level->toInt()))
+ if(repository == 0 || repository->isDisabled(level1->toInt()))
{
return false;
}
- return level->isGreaterOrEqual(getEffectiveLevel());
+ return level1->isGreaterOrEqual(getEffectiveLevel());
}
@@ -346,15 +346,15 @@
}*/
-void Logger::l7dlog(const LevelPtr& level, const LogString& key,
+void Logger::l7dlog(const LevelPtr& level1, const LogString& key,
const LocationInfo& location, const
std::vector<LogString>& params)
{
- if (repository == 0 || repository->isDisabled(level->toInt()))
+ if (repository == 0 || repository->isDisabled(level1->toInt()))
{
return;
}
- if (level->isGreaterOrEqual(getEffectiveLevel()))
+ if (level1->isGreaterOrEqual(getEffectiveLevel()))
{
LogString pattern = getResourceBundleString(key);
LogString msg;
@@ -368,29 +368,29 @@
msg = StringHelper::format(pattern, params);
}
- forcedLog(level, msg, location);
+ forcedLog(level1, msg, location);
}
}
-void Logger::l7dlog(const LevelPtr& level, const std::string& key,
+void Logger::l7dlog(const LevelPtr& level1, const std::string& key,
const LocationInfo& location) {
LOG4CXX_DECODE_CHAR(lkey, key);
std::vector<LogString> values(0);
- l7dlog(level, lkey, location, values);
+ l7dlog(level1, lkey, location, values);
}
-void Logger::l7dlog(const LevelPtr& level, const std::string& key,
+void Logger::l7dlog(const LevelPtr& level1, const std::string& key,
const LocationInfo& location, const std::string& val1) {
LOG4CXX_DECODE_CHAR(lkey, key);
LOG4CXX_DECODE_CHAR(lval1, val1);
std::vector<LogString> values(1);
values[0] = lval1;
- l7dlog(level, lkey, location, values);
+ l7dlog(level1, lkey, location, values);
}
-void Logger::l7dlog(const LevelPtr& level, const std::string& key,
+void Logger::l7dlog(const LevelPtr& level1, const std::string& key,
const LocationInfo& location,
const std::string& val1, const std::string& val2) {
LOG4CXX_DECODE_CHAR(lkey, key);
@@ -400,10 +400,10 @@
std::vector<LogString> values(2);
values[0] = lval1;
values[1] = lval2;
- l7dlog(level, lkey, location, values);
+ l7dlog(level1, lkey, location, values);
}
-void Logger::l7dlog(const LevelPtr& level, const std::string& key,
+void Logger::l7dlog(const LevelPtr& level1, const std::string& key,
const LocationInfo& location,
const std::string& val1, const std::string& val2, const
std::string& val3) {
LOG4CXX_DECODE_CHAR(lkey, key);
@@ -415,21 +415,21 @@
values[0] = lval1;
values[1] = lval2;
values[3] = lval3;
- l7dlog(level, lkey, location, values);
+ l7dlog(level1, lkey, location, values);
}
#if LOG4CXX_HAS_WCHAR_T
-void Logger::l7dlog(const LevelPtr& level, const std::wstring& key,
+void Logger::l7dlog(const LevelPtr& level1, const std::wstring& key,
const LocationInfo& location) {
LOG4CXX_DECODE_WCHAR(lkey, key);
std::vector<LogString> values(0);
- l7dlog(level, lkey, location, values);
+ l7dlog(level1, lkey, location, values);
}
-void Logger::l7dlog(const LevelPtr& level, const std::wstring& key,
+void Logger::l7dlog(const LevelPtr& level1, const std::wstring& key,
const LocationInfo& location,
const std::wstring& val1) {
LOG4CXX_DECODE_WCHAR(lval1, val1);
@@ -437,10 +437,10 @@
std::vector<LogString> values(1);
values[0] = lval1;
- l7dlog(level, lkey, location, values);
+ l7dlog(level1, lkey, location, values);
}
-void Logger::l7dlog(const LevelPtr& level, const std::wstring& key,
+void Logger::l7dlog(const LevelPtr& level1, const std::wstring& key,
const LocationInfo& location,
const std::wstring& val1, const std::wstring& val2) {
LOG4CXX_DECODE_WCHAR(lval1, val1);
@@ -450,10 +450,10 @@
std::vector<LogString> values(2);
values[0] = lval1;
values[1] = lval2;
- l7dlog(level, lkey, location, values);
+ l7dlog(level1, lkey, location, values);
}
-void Logger::l7dlog(const LevelPtr& level, const std::wstring& key,
+void Logger::l7dlog(const LevelPtr& level1, const std::wstring& key,
const LocationInfo& location,
const std::wstring& val1, const std::wstring& val2, const
std::wstring& val3) {
LOG4CXX_DECODE_WCHAR(lval1, val1);
@@ -465,7 +465,7 @@
values[0] = lval1;
values[1] = lval2;
values[2] = lval3;
- l7dlog(level, lkey, location, values);
+ l7dlog(level1, lkey, location, values);
}
#endif
@@ -493,31 +493,31 @@
aai->removeAppender(appender);
}
-void Logger::removeAppender(const LogString& name)
+void Logger::removeAppender(const LogString& name1)
{
synchronized sync(mutex);
- if(name.empty() || aai == 0)
+ if(name1.empty() || aai == 0)
{
return;
}
- aai->removeAppender(name);
+ aai->removeAppender(name1);
}
-void Logger::setAdditivity(bool additive)
+void Logger::setAdditivity(bool additive1)
{
- this->additive = additive;
+ this->additive = additive1;
}
-void Logger::setHierarchy(spi::LoggerRepository * repository)
+void Logger::setHierarchy(spi::LoggerRepository * repository1)
{
- this->repository = repository;
+ this->repository = repository1;
}
-void Logger::setLevel(const LevelPtr& level)
+void Logger::setLevel(const LevelPtr& level1)
{
- this->level = level;
+ this->level = level1;
}
@@ -686,32 +686,32 @@
}
#if LOG4CXX_HAS_WCHAR_T
-void Logger::log(const LevelPtr& level, const std::wstring& message,
+void Logger::log(const LevelPtr& level1, const std::wstring& message,
const log4cxx::spi::LocationInfo& location) {
- if (isEnabledFor(level)) {
- forcedLog(level, message, location);
+ if (isEnabledFor(level1)) {
+ forcedLog(level1, message, location);
}
}
#endif
-void Logger::log(const LevelPtr& level, const std::string& message,
+void Logger::log(const LevelPtr& level1, const std::string& message,
const log4cxx::spi::LocationInfo& location) {
- if (isEnabledFor(level)) {
- forcedLog(level, message, location);
+ if (isEnabledFor(level1)) {
+ forcedLog(level1, message, location);
}
}
#if LOG4CXX_HAS_WCHAR_T
-void Logger::log(const LevelPtr& level, const std::wstring& message) {
- if (isEnabledFor(level)) {
- forcedLog(level, message);
+void Logger::log(const LevelPtr& level1, const std::wstring& message) {
+ if (isEnabledFor(level1)) {
+ forcedLog(level1, message);
}
}
#endif
-void Logger::log(const LevelPtr& level, const std::string& message) {
- if (isEnabledFor(level)) {
- forcedLog(level, message);
+void Logger::log(const LevelPtr& level1, const std::string& message) {
+ if (isEnabledFor(level1)) {
+ forcedLog(level1, message);
}
}
Modified: logging/log4cxx/trunk/src/loggingevent.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/loggingevent.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/loggingevent.cpp (original)
+++ logging/log4cxx/trunk/src/loggingevent.cpp Mon Jul 17 10:54:21 2006
@@ -57,17 +57,17 @@
}
LoggingEvent::LoggingEvent(
- const LoggerPtr& logger, const LevelPtr& level,
- const LogString& message, const LocationInfo& locationInfo) :
- logger(logger),
- level(level),
+ const LoggerPtr& logger1, const LevelPtr& level1,
+ const LogString& message1, const LocationInfo& locationInfo1) :
+ logger(logger1),
+ level(level1),
ndc(LOG4CXX_STR("null")),
properties(0),
ndcLookupRequired(true),
mdcCopyLookupRequired(true),
- message(message),
+ message(message1),
timeStamp(apr_time_now()),
- locationInfo(locationInfo),
+ locationInfo(locationInfo1),
threadName(getCurrentThreadName()) {
}
Modified: logging/log4cxx/trunk/src/loggingeventpatternconverter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/loggingeventpatternconverter.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/loggingeventpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/loggingeventpatternconverter.cpp Mon Jul 17
10:54:21 2006
@@ -27,7 +27,7 @@
LoggingEventPatternConverter::LoggingEventPatternConverter(
- const LogString& name, const LogString& style) : PatternConverter(name,
style) {
+ const LogString& name1, const LogString& style1) : PatternConverter(name1,
style1) {
}
void LoggingEventPatternConverter::format(const ObjectPtr& obj,
Modified: logging/log4cxx/trunk/src/loglog.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/loglog.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/loglog.cpp (original)
+++ logging/log4cxx/trunk/src/loglog.cpp Mon Jul 17 10:54:21 2006
@@ -26,9 +26,9 @@
bool LogLog::debugEnabled = false;
bool LogLog::quietMode = false;
-void LogLog::setInternalDebugging(bool debugEnabled)
+void LogLog::setInternalDebugging(bool debugEnabled1)
{
- LogLog::debugEnabled = debugEnabled;
+ LogLog::debugEnabled = debugEnabled1;
}
void LogLog::debug(const LogString& msg)
@@ -59,9 +59,9 @@
emit(e.what());
}
-void LogLog::setQuietMode(bool quietMode)
+void LogLog::setQuietMode(bool quietMode1)
{
- LogLog::quietMode = quietMode;
+ LogLog::quietMode = quietMode1;
}
void LogLog::warn(const LogString& msg)
Modified: logging/log4cxx/trunk/src/logmanager.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/logmanager.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/logmanager.cpp (original)
+++ logging/log4cxx/trunk/src/logmanager.cpp Mon Jul 17 10:54:21 2006
@@ -53,9 +53,9 @@
}
void LogManager::setRepositorySelector(spi::RepositorySelectorPtr selector,
- void * guard)
+ void * guard1)
{
- if((LogManager::guard != 0) && (LogManager::guard != guard))
+ if((LogManager::guard != 0) && (LogManager::guard != guard1))
{
throw IllegalArgumentException("Attempted to reset the LoggerFactory
without possessing the guard.");
}
@@ -65,7 +65,7 @@
throw IllegalArgumentException("RepositorySelector must be
non-null.");
}
- LogManager::guard = guard;
+ LogManager::guard = guard1;
LogManager::getRepositorySelector() = selector;
}
Modified: logging/log4cxx/trunk/src/mdc.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/mdc.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/mdc.cpp (original)
+++ logging/log4cxx/trunk/src/mdc.cpp Mon Jul 17 10:54:21 2006
@@ -21,9 +21,9 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-MDC::MDC(const LogString& key, const LogString& value) : key(key)
+MDC::MDC(const LogString& key1, const LogString& value) : key(key1)
{
- put(key, value);
+ put(key1, value);
}
MDC::~MDC()
Modified: logging/log4cxx/trunk/src/nameabbreviator.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/nameabbreviator.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/nameabbreviator.cpp (original)
+++ logging/log4cxx/trunk/src/nameabbreviator.cpp Mon Jul 17 10:54:21 2006
@@ -77,7 +77,7 @@
* Create new instance.
* @param count maximum number of path elements to output.
*/
- MaxElementAbbreviator(const int count) : count(count) {
+ MaxElementAbbreviator(const int count1) : count(count1) {
}
/**
@@ -129,8 +129,8 @@
* '\0' if no ellipsis is desired.
*/
PatternAbbreviatorFragment(
- const int charCount, const logchar ellipsis)
- : charCount(charCount), ellipsis(ellipsis) {
+ const int charCount1, const logchar ellipsis1)
+ : charCount(charCount1), ellipsis(ellipsis1) {
}
PatternAbbreviatorFragment() : charCount(0), ellipsis(0) {
}
@@ -194,9 +194,9 @@
*
* @param fragments element abbreviation patterns.
*/
- PatternAbbreviator(const std::vector<PatternAbbreviatorFragment>&
fragments) :
- fragments(fragments) {
- if (fragments.size() == 0) {
+ PatternAbbreviator(const std::vector<PatternAbbreviatorFragment>&
fragments1) :
+ fragments(fragments1) {
+ if (fragments1.size() == 0) {
throw IllegalArgumentException("fragments parameter must contain at
least one element");
}
}
Modified: logging/log4cxx/trunk/src/namepatternconverter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/namepatternconverter.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/namepatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/namepatternconverter.cpp Mon Jul 17 10:54:21 2006
@@ -25,10 +25,10 @@
IMPLEMENT_LOG4CXX_OBJECT(NamePatternConverter)
NamePatternConverter::NamePatternConverter(
- const LogString& name,
- const LogString& style,
+ const LogString& name1,
+ const LogString& style1,
const std::vector<LogString>& options) :
- LoggingEventPatternConverter(name, style),
+ LoggingEventPatternConverter(name1, style1),
abbreviator(getAbbreviator(options)) {
}
Modified: logging/log4cxx/trunk/src/ndc.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ndc.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ndc.cpp (original)
+++ logging/log4cxx/trunk/src/ndc.cpp Mon Jul 17 10:54:21 2006
@@ -21,9 +21,9 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-NDC::DiagnosticContext::DiagnosticContext(const LogString& message,
+NDC::DiagnosticContext::DiagnosticContext(const LogString& message1,
const DiagnosticContext * parent)
- : fullMessage(message), message(message)
+ : fullMessage(message1), message(message1)
{
if (parent != 0)
{
Modified: logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp (original)
+++ logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp Mon Jul 17
10:54:21 2006
@@ -107,8 +107,8 @@
maxBackupIndex = maxBackups;
}
-void RollingFileAppender::setMaximumFileSize(int maxFileSize) {
- RollingFileAppender::maxFileSize = maxFileSize;
+void RollingFileAppender::setMaximumFileSize(int maxFileSize1) {
+ RollingFileAppender::maxFileSize = maxFileSize1;
}
void RollingFileAppender::setMaxFileSize(const LogString& value) {
Modified: logging/log4cxx/trunk/src/outputstreamwriter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/outputstreamwriter.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/outputstreamwriter.cpp (original)
+++ logging/log4cxx/trunk/src/outputstreamwriter.cpp Mon Jul 17 10:54:21 2006
@@ -26,20 +26,20 @@
IMPLEMENT_LOG4CXX_OBJECT(OutputStreamWriter)
-OutputStreamWriter::OutputStreamWriter(OutputStreamPtr& out)
- : out(out), enc(CharsetEncoder::getDefaultEncoder()) {
- if (out == 0) {
+OutputStreamWriter::OutputStreamWriter(OutputStreamPtr& out1)
+ : out(out1), enc(CharsetEncoder::getDefaultEncoder()) {
+ if (out1 == 0) {
throw NullPointerException("out parameter may not be null.");
}
}
-OutputStreamWriter::OutputStreamWriter(OutputStreamPtr& out,
- CharsetEncoderPtr &enc)
- : out(out), enc(enc) {
- if (out == 0) {
+OutputStreamWriter::OutputStreamWriter(OutputStreamPtr& out1,
+ CharsetEncoderPtr &enc1)
+ : out(out1), enc(enc1) {
+ if (out1 == 0) {
throw NullPointerException("out parameter may not be null.");
}
- if (enc == 0) {
+ if (enc1 == 0) {
throw NullPointerException("enc parameter may not be null.");
}
}
Modified: logging/log4cxx/trunk/src/patternconverter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/patternconverter.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/patternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/patternconverter.cpp Mon Jul 17 10:54:21 2006
@@ -24,8 +24,8 @@
IMPLEMENT_LOG4CXX_OBJECT(PatternConverter)
PatternConverter::PatternConverter(
- const LogString& name, const LogString& style) :
- name(name), style(style) {
+ const LogString& name1, const LogString& style1) :
+ name(name1), style(style1) {
}
PatternConverter::~PatternConverter() {
Modified: logging/log4cxx/trunk/src/pool.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/pool.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/pool.cpp (original)
+++ logging/log4cxx/trunk/src/pool.cpp Mon Jul 17 10:54:21 2006
@@ -34,7 +34,7 @@
pool = aprPool;
}
-Pool::Pool(log4cxx_pool_t* p, bool release) : pool((apr_pool_t*) p),
release(release) {
+Pool::Pool(log4cxx_pool_t* p, bool release1) : pool((apr_pool_t*) p),
release(release1) {
assert(p != NULL);
}
Modified: logging/log4cxx/trunk/src/propertiespatternconverter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/propertiespatternconverter.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/propertiespatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/propertiespatternconverter.cpp Mon Jul 17
10:54:21 2006
@@ -27,9 +27,9 @@
IMPLEMENT_LOG4CXX_OBJECT(PropertiesPatternConverter)
-PropertiesPatternConverter::PropertiesPatternConverter(const LogString& name,
+PropertiesPatternConverter::PropertiesPatternConverter(const LogString& name1,
const LogString& propertyName) :
- LoggingEventPatternConverter(name,LOG4CXX_STR("property")),
+ LoggingEventPatternConverter(name1,LOG4CXX_STR("property")),
option(propertyName) {
}
Modified: logging/log4cxx/trunk/src/propertysetter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/propertysetter.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/propertysetter.cpp (original)
+++ logging/log4cxx/trunk/src/propertysetter.cpp Mon Jul 17 10:54:21 2006
@@ -30,7 +30,7 @@
using namespace log4cxx::spi;
using namespace log4cxx::config;
-PropertySetter::PropertySetter(const helpers::ObjectPtr& obj) : obj(obj)
+PropertySetter::PropertySetter(const helpers::ObjectPtr& obj1) : obj(obj1)
{
}
Modified: logging/log4cxx/trunk/src/rollingfileappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/rollingfileappender.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/rollingfileappender.cpp (original)
+++ logging/log4cxx/trunk/src/rollingfileappender.cpp Mon Jul 17 10:54:21 2006
@@ -67,19 +67,19 @@
rollingPolicy->activateOptions(p);
try {
- RolloverDescriptionPtr rollover =
+ RolloverDescriptionPtr rollover1 =
rollingPolicy->initialize(getFile(), getAppend(), p);
- if (rollover != NULL) {
- ActionPtr syncAction(rollover->getSynchronous());
+ if (rollover1 != NULL) {
+ ActionPtr syncAction(rollover1->getSynchronous());
if (syncAction != NULL) {
syncAction->execute(p);
}
- setFile(rollover->getActiveFileName());
- setAppend(rollover->getAppend());
- lastRolloverAsyncAction = rollover->getAsynchronous();
+ setFile(rollover1->getActiveFileName());
+ setAppend(rollover1->getAppend());
+ lastRolloverAsyncAction = rollover1->getAsynchronous();
if (lastRolloverAsyncAction != NULL) {
// Thread runner = new Thread(lastRolloverAsyncAction);
@@ -144,72 +144,72 @@
}
try {
- RolloverDescriptionPtr rollover(rollingPolicy->rollover(getFile(), p));
+ RolloverDescriptionPtr rollover1(rollingPolicy->rollover(getFile(),
p));
- if (rollover != NULL) {
- if (rollover->getActiveFileName() == getFile()) {
+ if (rollover1 != NULL) {
+ if (rollover1->getActiveFileName() == getFile()) {
closeWriter();
bool success = true;
- if (rollover->getSynchronous() != NULL) {
+ if (rollover1->getSynchronous() != NULL) {
success = false;
try {
- success = rollover->getSynchronous()->execute(p);
+ success = rollover1->getSynchronous()->execute(p);
} catch (std::exception& ex) {
LogLog::warn(LOG4CXX_STR("Exception on rollover"));
}
}
if (success) {
- if (rollover->getAppend()) {
- fileLength = File(rollover->getActiveFileName()).length(p);
+ if (rollover1->getAppend()) {
+ fileLength = File(rollover1->getActiveFileName()).length(p);
} else {
fileLength = 0;
}
- if (rollover->getAsynchronous() != NULL) {
- lastRolloverAsyncAction = rollover->getAsynchronous();
+ if (rollover1->getAsynchronous() != NULL) {
+ lastRolloverAsyncAction = rollover1->getAsynchronous();
// new Thread(lastRolloverAsyncAction).start();
}
setFile(
- rollover->getActiveFileName(), rollover->getAppend(),
+ rollover1->getActiveFileName(), rollover1->getAppend(),
bufferedIO, bufferSize, p);
} else {
setFile(
- rollover->getActiveFileName(), true, bufferedIO, bufferSize,
p);
+ rollover1->getActiveFileName(), true, bufferedIO, bufferSize,
p);
}
} else {
OutputStreamPtr os(new FileOutputStream(
- rollover->getActiveFileName(), rollover->getAppend()));
+ rollover1->getActiveFileName(), rollover1->getAppend()));
WriterPtr newWriter(createWriter(os));
closeWriter();
- setFile(rollover->getActiveFileName());
+ setFile(rollover1->getActiveFileName());
setWriter(newWriter);
bool success = true;
- if (rollover->getSynchronous() != NULL) {
+ if (rollover1->getSynchronous() != NULL) {
success = false;
try {
- success = rollover->getSynchronous()->execute(p);
+ success = rollover1->getSynchronous()->execute(p);
} catch (std::exception& ex) {
LogLog::warn(LOG4CXX_STR("Exception during rollover"));
}
}
if (success) {
- if (rollover->getAppend()) {
- fileLength = File(rollover->getActiveFileName()).length(p);
+ if (rollover1->getAppend()) {
+ fileLength = File(rollover1->getActiveFileName()).length(p);
} else {
fileLength = 0;
}
- if (rollover->getAsynchronous() != NULL) {
- lastRolloverAsyncAction = rollover->getAsynchronous();
+ if (rollover1->getAsynchronous() != NULL) {
+ lastRolloverAsyncAction = rollover1->getAsynchronous();
// new Thread(lastRolloverAsyncAction).start();
}
}
@@ -323,8 +323,8 @@
* @param rfa rolling file appender to inform.
*/
CountingOutputStream(
- OutputStreamPtr& os, RollingFileAppender* rfa) :
- os(os), rfa(rfa) {
+ OutputStreamPtr& os1, RollingFileAppender* rfa1) :
+ os(os1), rfa(rfa1) {
}
/**
Modified: logging/log4cxx/trunk/src/rolloverdescription.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/rolloverdescription.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/rolloverdescription.cpp (original)
+++ logging/log4cxx/trunk/src/rolloverdescription.cpp Mon Jul 17 10:54:21 2006
@@ -28,14 +28,14 @@
}
RolloverDescription::RolloverDescription(
- const LogString& activeFileName,
- const bool append,
- const ActionPtr& synchronous,
- const ActionPtr& asynchronous)
- : activeFileName(activeFileName),
- append(append),
- synchronous(synchronous),
- asynchronous(asynchronous) {
+ const LogString& activeFileName1,
+ const bool append1,
+ const ActionPtr& synchronous1,
+ const ActionPtr& asynchronous1)
+ : activeFileName(activeFileName1),
+ append(append1),
+ synchronous(synchronous1),
+ asynchronous(asynchronous1) {
}
LogString RolloverDescription::getActiveFileName() const {
Modified: logging/log4cxx/trunk/src/rootcategory.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/rootcategory.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/rootcategory.cpp (original)
+++ logging/log4cxx/trunk/src/rootcategory.cpp Mon Jul 17 10:54:21 2006
@@ -23,9 +23,9 @@
using namespace log4cxx::spi;
using namespace log4cxx::helpers;
-RootCategory::RootCategory(const LevelPtr& level) : Logger(LOG4CXX_STR("root"))
+RootCategory::RootCategory(const LevelPtr& level1) :
Logger(LOG4CXX_STR("root"))
{
- setLevel(level);
+ setLevel(level1);
}
const LevelPtr& RootCategory::getEffectiveLevel() const
@@ -33,16 +33,16 @@
return level;
}
-void RootCategory::setLevel(const LevelPtr& level)
+void RootCategory::setLevel(const LevelPtr& level1)
{
- if(level == 0)
+ if(level1 == 0)
{
LogLog::error(LOG4CXX_STR("You have tried to set a null level to
root."));
}
else
{
- this->level = level;
+ this->level = level1;
}
}
Modified: logging/log4cxx/trunk/src/socketappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/socketappender.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/socketappender.cpp (original)
+++ logging/log4cxx/trunk/src/socketappender.cpp Mon Jul 17 10:54:21 2006
@@ -46,13 +46,13 @@
: SocketAppenderSkeleton(DEFAULT_PORT, DEFAULT_RECONNECTION_DELAY) {
}
-SocketAppender::SocketAppender(InetAddressPtr& address, int port)
-: SocketAppenderSkeleton(address, port, DEFAULT_RECONNECTION_DELAY) {
+SocketAppender::SocketAppender(InetAddressPtr& address1, int port1)
+: SocketAppenderSkeleton(address1, port1, DEFAULT_RECONNECTION_DELAY) {
connect();
}
-SocketAppender::SocketAppender(const LogString& host, int port)
-: SocketAppenderSkeleton(host, port, DEFAULT_RECONNECTION_DELAY) {
+SocketAppender::SocketAppender(const LogString& host, int port1)
+: SocketAppenderSkeleton(host, port1, DEFAULT_RECONNECTION_DELAY) {
connect();
}
Modified: logging/log4cxx/trunk/src/socketappenderskeleton.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/socketappenderskeleton.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/socketappenderskeleton.cpp (original)
+++ logging/log4cxx/trunk/src/socketappenderskeleton.cpp Mon Jul 17 10:54:21
2006
@@ -34,23 +34,23 @@
#if APR_HAS_THREADS
-SocketAppenderSkeleton::SocketAppenderSkeleton(int defaultPort, int
reconnectionDelay)
+SocketAppenderSkeleton::SocketAppenderSkeleton(int defaultPort, int
reconnectionDelay1)
: pool(),
remoteHost(),
address(),
port(defaultPort),
os(),
- reconnectionDelay(reconnectionDelay),
+ reconnectionDelay(reconnectionDelay1),
locationInfo(false),
thread() {
}
-SocketAppenderSkeleton::SocketAppenderSkeleton(InetAddressPtr address, int
port, int delay)
+SocketAppenderSkeleton::SocketAppenderSkeleton(InetAddressPtr address1, int
port1, int delay)
:
pool(),
remoteHost(),
- address(address),
- port(port),
+ address(address1),
+ port(port1),
os(),
reconnectionDelay(delay),
locationInfo(false),
@@ -58,11 +58,11 @@
remoteHost = this->address->getHostName();
}
-SocketAppenderSkeleton::SocketAppenderSkeleton(const LogString& host, int
port, int delay)
+SocketAppenderSkeleton::SocketAppenderSkeleton(const LogString& host, int
port1, int delay)
: pool(),
remoteHost(host),
address(InetAddress::getByName(host)),
- port(port),
+ port(port1),
os(),
reconnectionDelay(delay),
locationInfo(false),
Modified: logging/log4cxx/trunk/src/sockethubappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/sockethubappender.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/sockethubappender.cpp (original)
+++ logging/log4cxx/trunk/src/sockethubappender.cpp Mon Jul 17 10:54:21 2006
@@ -47,8 +47,8 @@
{
}
-SocketHubAppender::SocketHubAppender(int port)
- : port(port), oosList(), locationInfo(false), thread()
+SocketHubAppender::SocketHubAppender(int port1)
+ : port(port1), oosList(), locationInfo(false), thread()
{
startServer();
}
Modified: logging/log4cxx/trunk/src/socketimpl.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/socketimpl.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/socketimpl.cpp (original)
+++ logging/log4cxx/trunk/src/socketimpl.cpp Mon Jul 17 10:54:21 2006
@@ -39,13 +39,13 @@
SocketException::SocketException() : errorNumber(0), msg("SocketException") {
}
-SocketException::SocketException(const char *what, apr_status_t status) :
+SocketException::SocketException(const char *what1, apr_status_t status) :
errorNumber(status) {
// build the error message text
char buffer[200];
apr_strerror(status, buffer, sizeof buffer);
- msg = std::string(what) + std::string(": ") + buffer;
+ msg = std::string(what1) + std::string(": ") + buffer;
}
SocketException::SocketException(apr_status_t status) :
@@ -72,8 +72,8 @@
return errorNumber;
}
-PlatformSocketException::PlatformSocketException(const char* what,
apr_status_t status) :
- SocketException(what, status) {
+PlatformSocketException::PlatformSocketException(const char* what1,
apr_status_t status) :
+ SocketException(what1, status) {
}
PlatformSocketException::PlatformSocketException(const
PlatformSocketException& src)
@@ -217,15 +217,15 @@
/** Binds this socket to the specified port number
on the specified host.
*/
-void SocketImpl::bind(InetAddressPtr address, int port)
+void SocketImpl::bind(InetAddressPtr address1, int port1)
{
- LOG4CXX_ENCODE_CHAR(host, address->getHostAddress());
+ LOG4CXX_ENCODE_CHAR(host, address1->getHostAddress());
// Create server socket address (including port number)
apr_sockaddr_t *server_addr;
- apr_status_t status =
+ apr_status_t status =
apr_sockaddr_info_get(&server_addr, host.c_str(), APR_INET,
- port, 0, (apr_pool_t*)
memoryPool.getAPRPool());
+ port1, 0, (apr_pool_t*)
memoryPool.getAPRPool());
if (status != APR_SUCCESS) {
throw ConnectException(status);
}
@@ -236,7 +236,7 @@
throw BindException(status);
}
- this->localport = port;
+ this->localport = port1;
}
/** Closes this socket. */
@@ -259,15 +259,15 @@
/** Connects this socket to the specified port number
on the specified host.
*/
-void SocketImpl::connect(InetAddressPtr address, int port)
+void SocketImpl::connect(InetAddressPtr address1, int port1)
{
- LOG4CXX_ENCODE_CHAR(host, address->getHostAddress());
+ LOG4CXX_ENCODE_CHAR(host, address1->getHostAddress());
// create socket address (including port)
apr_sockaddr_t *client_addr;
- apr_status_t status =
+ apr_status_t status =
apr_sockaddr_info_get(&client_addr, host.c_str(), APR_INET,
- port, 0, (apr_pool_t*)
memoryPool.getAPRPool());
+ port1, 0, (apr_pool_t*)
memoryPool.getAPRPool());
if (status != APR_SUCCESS) {
throw ConnectException(status);
}
@@ -278,14 +278,14 @@
throw ConnectException();
}
- this->address = address;
- this->port = port;
+ this->address = address1;
+ this->port = port1;
}
/** Connects this socket to the specified port on the named host. */
-void SocketImpl::connect(const LogString& host, int port)
+void SocketImpl::connect(const LogString& host, int port1)
{
- connect(InetAddress::getByName(host), port);
+ connect(InetAddress::getByName(host), port1);
}
/** Creates either a stream or a datagram socket. */
Modified: logging/log4cxx/trunk/src/socketinputstream.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/socketinputstream.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/socketinputstream.cpp (original)
+++ logging/log4cxx/trunk/src/socketinputstream.cpp Mon Jul 17 10:54:21 2006
@@ -27,15 +27,15 @@
size_t SocketInputStream::DEFAULT_BUFFER_SIZE = 32;
-SocketInputStream::SocketInputStream(SocketPtr socket)
-: socket(socket), bufferSize(DEFAULT_BUFFER_SIZE),
+SocketInputStream::SocketInputStream(SocketPtr socket1)
+: socket(socket1), bufferSize(DEFAULT_BUFFER_SIZE),
memBuffer(), currentPos(0), maxPos(0)
{
// memBuffer = new unsigned char[bufferSize];
}
-SocketInputStream::SocketInputStream(SocketPtr socket, size_t bufferSize)
-: socket(socket), bufferSize(bufferSize),
+SocketInputStream::SocketInputStream(SocketPtr socket1, size_t bufferSize1)
+: socket(socket1), bufferSize(bufferSize1),
memBuffer(), currentPos(0), maxPos(0)
{
// memBuffer = new unsigned char[bufferSize];
@@ -48,9 +48,9 @@
void SocketInputStream::read(void * buf, size_t len) const
{
- size_t read = socket->read(buf, len);
+ size_t read1 = socket->read(buf, len);
- if (read == 0)
+ if (read1 == 0)
{
throw EOFException();
}
Modified: logging/log4cxx/trunk/src/socketnode.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/socketnode.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/socketnode.cpp (original)
+++ logging/log4cxx/trunk/src/socketnode.cpp Mon Jul 17 10:54:21 2006
@@ -31,9 +31,9 @@
IMPLEMENT_LOG4CXX_OBJECT(SocketNode)
SocketNode::SocketNode(helpers::SocketPtr& socket,
- spi::LoggerRepositoryPtr& hierarchy)
- : is(socket->getInputStream()),
- hierarchy(hierarchy)
+ spi::LoggerRepositoryPtr& hierarchy1)
+ : is(socket->getInputStream()),
+ hierarchy(hierarchy1)
{
}
Modified: logging/log4cxx/trunk/src/socketoutputstream.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/socketoutputstream.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/socketoutputstream.cpp (original)
+++ logging/log4cxx/trunk/src/socketoutputstream.cpp Mon Jul 17 10:54:21 2006
@@ -26,8 +26,8 @@
#define INCREMENT 512
-SocketOutputStream::SocketOutputStream(SocketPtr socket)
-: socket(socket), beg(0), cur(0), end(0)
+SocketOutputStream::SocketOutputStream(SocketPtr socket1)
+: socket(socket1), beg(0), cur(0), end(0)
{
}
Modified: logging/log4cxx/trunk/src/stringtokenizer.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/stringtokenizer.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/stringtokenizer.cpp (original)
+++ logging/log4cxx/trunk/src/stringtokenizer.cpp Mon Jul 17 10:54:21 2006
@@ -22,8 +22,8 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-StringTokenizer::StringTokenizer(const LogString& str, const LogString& delim)
-: src(str), delim(delim), pos(0)
+StringTokenizer::StringTokenizer(const LogString& str, const LogString& delim1)
+: src(str), delim(delim1), pos(0)
{
}
Modified: logging/log4cxx/trunk/src/synchronized.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/synchronized.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/synchronized.cpp (original)
+++ logging/log4cxx/trunk/src/synchronized.cpp Mon Jul 17 10:54:21 2006
@@ -24,8 +24,8 @@
using namespace log4cxx::helpers;
using namespace log4cxx;
-synchronized::synchronized(const Mutex& mutex)
-: mutex(mutex.getAPRMutex())
+synchronized::synchronized(const Mutex& mutex1)
+: mutex(mutex1.getAPRMutex())
{
#if APR_HAS_THREADS
apr_status_t stat = apr_thread_mutex_lock(
Modified: logging/log4cxx/trunk/src/syslogappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/syslogappender.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/syslogappender.cpp (original)
+++ logging/log4cxx/trunk/src/syslogappender.cpp Mon Jul 17 10:54:21 2006
@@ -66,21 +66,21 @@
}
-SyslogAppender::SyslogAppender(const LayoutPtr& layout,
- int syslogFacility)
-: syslogFacility(syslogFacility), facilityPrinting(false), sw(0)
+SyslogAppender::SyslogAppender(const LayoutPtr& layout1,
+ int syslogFacility1)
+: syslogFacility(syslogFacility1), facilityPrinting(false), sw(0)
{
- this->layout = layout;
+ this->layout = layout1;
this->initSyslogFacilityStr();
}
-SyslogAppender::SyslogAppender(const LayoutPtr& layout,
- const LogString& syslogHost, int syslogFacility)
-: syslogFacility(syslogFacility), facilityPrinting(false), sw(0)
+SyslogAppender::SyslogAppender(const LayoutPtr& layout1,
+ const LogString& syslogHost1, int syslogFacility1)
+: syslogFacility(syslogFacility1), facilityPrinting(false), sw(0)
{
- this->layout = layout;
+ this->layout = layout1;
this->initSyslogFacilityStr();
- setSyslogHost(syslogHost);
+ setSyslogHost(syslogHost1);
}
SyslogAppender::~SyslogAppender()
@@ -313,7 +313,7 @@
}
}
-void SyslogAppender::setSyslogHost(const LogString& syslogHost)
+void SyslogAppender::setSyslogHost(const LogString& syslogHost1)
{
if (this->sw != 0)
{
@@ -324,12 +324,12 @@
// On the local host, we can directly use the system function 'syslog'
// if it is available (cf. append)
#ifdef LOG4CXX_HAVE_SYSLOG
- if (syslogHost != LOG4CXX_STR("localhost") && syslogHost !=
LOG4CXX_STR("127.0.0.1")
- && !syslogHost.empty())
+ if (syslogHost1 != LOG4CXX_STR("localhost") && syslogHost1 !=
LOG4CXX_STR("127.0.0.1")
+ && !syslogHost1.empty())
#endif
- this->sw = new SyslogWriter(syslogHost);
+ this->sw = new SyslogWriter(syslogHost1);
- this->syslogHost = syslogHost;
+ this->syslogHost = syslogHost1;
}
Modified: logging/log4cxx/trunk/src/syslogwriter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/syslogwriter.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/syslogwriter.cpp (original)
+++ logging/log4cxx/trunk/src/syslogwriter.cpp Mon Jul 17 10:54:21 2006
@@ -28,16 +28,16 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-SyslogWriter::SyslogWriter(const LogString& syslogHost)
-: syslogHost(syslogHost)
+SyslogWriter::SyslogWriter(const LogString& syslogHost1)
+: syslogHost(syslogHost1)
{
try
{
- this->address = InetAddress::getByName(syslogHost);
+ this->address = InetAddress::getByName(syslogHost1);
}
catch(UnknownHostException& e)
{
- LogLog::error(((LogString) LOG4CXX_STR("Could not find ")) + syslogHost +
+ LogLog::error(((LogString) LOG4CXX_STR("Could not find ")) + syslogHost1
+
LOG4CXX_STR(". All logging will FAIL."), e);
}
@@ -47,7 +47,7 @@
}
catch (SocketException& e)
{
- LogLog::error(((LogString) LOG4CXX_STR("Could not instantiate
DatagramSocket to ")) + syslogHost +
+ LogLog::error(((LogString) LOG4CXX_STR("Could not instantiate
DatagramSocket to ")) + syslogHost1 +
LOG4CXX_STR(". All logging will FAIL."), e);
}
}
Modified: logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp
(original)
+++ logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp Mon Jul
17 10:54:21 2006
@@ -29,10 +29,10 @@
IMPLEMENT_LOG4CXX_OBJECT(ThrowableInformationPatternConverter)
-ThrowableInformationPatternConverter::ThrowableInformationPatternConverter(bool
shortReport) :
+ThrowableInformationPatternConverter::ThrowableInformationPatternConverter(bool
shortReport1) :
LoggingEventPatternConverter(LOG4CXX_STR("Throwable"),
LOG4CXX_STR("throwable")),
- shortReport(shortReport) {
+ shortReport(shortReport1) {
}
PatternConverterPtr ThrowableInformationPatternConverter::newInstance(
Modified: logging/log4cxx/trunk/src/timezone.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/timezone.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/timezone.cpp (original)
+++ logging/log4cxx/trunk/src/timezone.cpp Mon Jul 17 10:54:21 2006
@@ -130,7 +130,7 @@
class FixedTimeZone : public TimeZone
{
public:
- FixedTimeZone( const LogString & name, apr_int32_t offset ) :
TimeZone( name ), offset( offset )
+ FixedTimeZone( const LogString & name, apr_int32_t offset1 ) :
TimeZone( name ), offset( offset1 )
{
}
@@ -161,7 +161,7 @@
-TimeZone::TimeZone( const LogString & id ) : id( id )
+TimeZone::TimeZone( const LogString & id1 ) : id( id1 )
{
}
Modified: logging/log4cxx/trunk/src/writerappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/writerappender.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/writerappender.cpp (original)
+++ logging/log4cxx/trunk/src/writerappender.cpp Mon Jul 17 10:54:21 2006
@@ -30,15 +30,15 @@
: immediateFlush(true) {
}
-WriterAppender::WriterAppender(const LayoutPtr& layout,
- log4cxx::helpers::WriterPtr& writer)
- : AppenderSkeleton(layout), writer(writer), immediateFlush(true) {
+WriterAppender::WriterAppender(const LayoutPtr& layout1,
+ log4cxx::helpers::WriterPtr& writer1)
+ : AppenderSkeleton(layout1), writer(writer1), immediateFlush(true) {
Pool p;
activateOptions(p);
}
-WriterAppender::WriterAppender(const LayoutPtr& layout)
- : AppenderSkeleton(layout), immediateFlush(true) {
+WriterAppender::WriterAppender(const LayoutPtr& layout1)
+ : AppenderSkeleton(layout1), immediateFlush(true) {
}
Modified: logging/log4cxx/trunk/src/xmlsocketappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/xmlsocketappender.cpp?rev=422771&r1=422770&r2=422771&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/xmlsocketappender.cpp (original)
+++ logging/log4cxx/trunk/src/xmlsocketappender.cpp Mon Jul 17 10:54:21 2006
@@ -50,16 +50,16 @@
memset(zeroBuffer, 0, MAX_EVENT_LEN);
}
-XMLSocketAppender::XMLSocketAppender(InetAddressPtr address, int port)
-: SocketAppenderSkeleton(address, port, DEFAULT_RECONNECTION_DELAY)
+XMLSocketAppender::XMLSocketAppender(InetAddressPtr address1, int port1)
+: SocketAppenderSkeleton(address1, port1, DEFAULT_RECONNECTION_DELAY)
{
layout = new XMLLayout();
memset(zeroBuffer, 0, MAX_EVENT_LEN);
connect();
}
-XMLSocketAppender::XMLSocketAppender(const LogString& host, int port)
-: SocketAppenderSkeleton(host, port, DEFAULT_RECONNECTION_DELAY)
+XMLSocketAppender::XMLSocketAppender(const LogString& host, int port1)
+: SocketAppenderSkeleton(host, port1, DEFAULT_RECONNECTION_DELAY)
{
layout = new XMLLayout();
memset(zeroBuffer, 0, MAX_EVENT_LEN);
