You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2018/08/19 12:42:04 UTC
[3/6] logging-log4cxx git commit: LOGCXX-500: Remove unnecessary
whitespace for easier applying of patches.
LOGCXX-500: Remove unnecessary whitespace for easier applying of patches.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/8c3fe024
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/8c3fe024
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/8c3fe024
Branch: refs/heads/LOGCXX-500
Commit: 8c3fe02484bd989acb3e170250a4556a5baa7cc0
Parents: f24fd87
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Aug 19 14:00:22 2018 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Aug 19 14:00:22 2018 +0200
----------------------------------------------------------------------
src/main/cpp/appenderskeleton.cpp | 2 +-
src/main/cpp/asyncappender.cpp | 24 +--
src/main/cpp/charsetdecoder.cpp | 12 +-
src/main/cpp/charsetencoder.cpp | 8 +-
src/main/cpp/class.cpp | 2 +-
src/main/cpp/defaultrepositoryselector.cpp | 8 +-
src/main/cpp/domconfigurator.cpp | 42 ++---
src/main/cpp/exception.cpp | 14 +-
src/main/cpp/file.cpp | 8 +-
src/main/cpp/fileappender.cpp | 14 +-
src/main/cpp/fileinputstream.cpp | 2 +-
src/main/cpp/gzcompressaction.cpp | 10 +-
src/main/cpp/hierarchy.cpp | 12 +-
src/main/cpp/inetaddress.cpp | 6 +-
src/main/cpp/inputstreamreader.cpp | 2 +-
src/main/cpp/layout.cpp | 4 +-
src/main/cpp/locationinfo.cpp | 20 +--
src/main/cpp/logger.cpp | 90 +++++------
src/main/cpp/loggingevent.cpp | 104 ++++++------
src/main/cpp/logstream.cpp | 74 ++++-----
src/main/cpp/messagebuffer.cpp | 8 +-
src/main/cpp/nteventlogappender.cpp | 8 +-
src/main/cpp/objectoutputstream.cpp | 28 ++--
src/main/cpp/obsoleterollingfileappender.cpp | 8 +-
src/main/cpp/odbcappender.cpp | 22 +--
src/main/cpp/optionconverter.cpp | 4 +-
src/main/cpp/rootlogger.cpp | 2 +-
src/main/cpp/serversocket.cpp | 26 +--
src/main/cpp/simpledateformat.cpp | 32 ++--
src/main/cpp/smtpappender.cpp | 70 ++++----
src/main/cpp/socket.cpp | 10 +-
src/main/cpp/sockethubappender.cpp | 4 +-
src/main/cpp/syslogwriter.cpp | 2 +-
src/main/cpp/system.cpp | 2 +-
src/main/cpp/telnetappender.cpp | 12 +-
src/main/cpp/threadcxx.cpp | 6 +-
src/main/cpp/threadlocal.cpp | 6 +-
src/main/cpp/threadspecificdata.cpp | 4 +-
src/main/cpp/transcoder.cpp | 18 +--
src/main/cpp/transform.cpp | 12 +-
src/main/cpp/writerappender.cpp | 4 +-
src/main/cpp/xmllayout.cpp | 8 +-
src/main/cpp/zipcompressaction.cpp | 10 +-
src/main/include/log4cxx/asyncappender.h | 24 +--
src/main/include/log4cxx/consoleappender.h | 2 +-
.../include/log4cxx/dailyrollingfileappender.h | 2 +-
src/main/include/log4cxx/db/odbcappender.h | 4 +-
src/main/include/log4cxx/defaultloggerfactory.h | 2 +-
src/main/include/log4cxx/file.h | 6 +-
src/main/include/log4cxx/filter/andfilter.h | 2 +-
.../include/log4cxx/filter/expressionfilter.h | 2 +-
.../include/log4cxx/filter/locationinfofilter.h | 2 +-
.../include/log4cxx/filter/propertyfilter.h | 2 +-
.../log4cxx/helpers/appenderattachableimpl.h | 4 +-
.../log4cxx/helpers/bytearrayinputstream.h | 2 +-
.../include/log4cxx/helpers/charsetdecoder.h | 4 +-
src/main/include/log4cxx/helpers/condition.h | 2 +-
src/main/include/log4cxx/helpers/cyclicbuffer.h | 2 +-
src/main/include/log4cxx/helpers/exception.h | 6 +-
.../include/log4cxx/helpers/fileinputstream.h | 6 +-
.../include/log4cxx/helpers/fileoutputstream.h | 2 +-
src/main/include/log4cxx/helpers/inputstream.h | 4 +-
.../include/log4cxx/helpers/inputstreamreader.h | 2 +-
src/main/include/log4cxx/helpers/loglog.h | 4 +-
.../include/log4cxx/helpers/messagebuffer.h | 38 ++---
.../log4cxx/helpers/objectoutputstream.h | 6 +-
src/main/include/log4cxx/helpers/objectptr.h | 14 +-
.../include/log4cxx/helpers/optionconverter.h | 2 +-
src/main/include/log4cxx/helpers/reader.h | 2 +-
src/main/include/log4cxx/helpers/serversocket.h | 4 +-
.../include/log4cxx/helpers/simpledateformat.h | 2 +-
src/main/include/log4cxx/helpers/socket.h | 12 +-
.../log4cxx/helpers/socketoutputstream.h | 4 +-
.../include/log4cxx/helpers/systemoutwriter.h | 4 +-
src/main/include/log4cxx/helpers/thread.h | 20 +--
src/main/include/log4cxx/helpers/threadlocal.h | 8 +-
.../log4cxx/helpers/threadspecificdata.h | 6 +-
src/main/include/log4cxx/helpers/transcoder.h | 16 +-
src/main/include/log4cxx/layout.h | 2 +-
src/main/include/log4cxx/level.h | 10 +-
src/main/include/log4cxx/logger.h | 50 +++---
src/main/include/log4cxx/logmanager.h | 4 +-
src/main/include/log4cxx/logstring.h | 4 +-
src/main/include/log4cxx/mdc.h | 12 +-
src/main/include/log4cxx/ndc.h | 24 +--
src/main/include/log4cxx/net/smtpappender.h | 12 +-
src/main/include/log4cxx/net/socketappender.h | 10 +-
.../log4cxx/net/socketappenderskeleton.h | 8 +-
src/main/include/log4cxx/net/telnetappender.h | 8 +-
.../include/log4cxx/net/xmlsocketappender.h | 10 +-
.../log4cxx/pattern/classnamepatternconverter.h | 4 +-
.../log4cxx/pattern/datepatternconverter.h | 4 +-
.../log4cxx/pattern/filedatepatternconverter.h | 4 +-
.../pattern/filelocationpatternconverter.h | 4 +-
.../include/log4cxx/pattern/formattinginfo.h | 4 +-
.../pattern/fulllocationpatternconverter.h | 4 +-
.../log4cxx/pattern/integerpatternconverter.h | 4 +-
.../log4cxx/pattern/levelpatternconverter.h | 4 +-
.../pattern/linelocationpatternconverter.h | 4 +-
.../pattern/lineseparatorpatternconverter.h | 4 +-
.../log4cxx/pattern/literalpatternconverter.h | 4 +-
.../log4cxx/pattern/loggerpatternconverter.h | 4 +-
.../pattern/loggingeventpatternconverter.h | 4 +-
.../log4cxx/pattern/messagepatternconverter.h | 4 +-
.../pattern/methodlocationpatternconverter.h | 4 +-
.../include/log4cxx/pattern/nameabbreviator.h | 4 +-
.../log4cxx/pattern/ndcpatternconverter.h | 4 +-
.../include/log4cxx/pattern/patternconverter.h | 2 +-
.../include/log4cxx/pattern/patternparser.h | 2 +-
.../pattern/propertiespatternconverter.h | 4 +-
.../pattern/relativetimepatternconverter.h | 4 +-
.../log4cxx/pattern/threadpatternconverter.h | 4 +-
.../throwableinformationpatternconverter.h | 4 +-
src/main/include/log4cxx/propertyconfigurator.h | 2 +-
src/main/include/log4cxx/provisionnode.h | 8 +-
.../rolling/filterbasedtriggeringpolicy.h | 4 +-
.../log4cxx/rolling/fixedwindowrollingpolicy.h | 4 +-
.../log4cxx/rolling/manualtriggeringpolicy.h | 2 +-
.../log4cxx/rolling/rollingfileappender.h | 8 +-
.../rolling/rollingfileappenderskeleton.h | 6 +-
.../include/log4cxx/rolling/rollingpolicy.h | 4 +-
.../include/log4cxx/rolling/rollingpolicybase.h | 4 +-
.../log4cxx/rolling/sizebasedtriggeringpolicy.h | 2 +-
.../log4cxx/rolling/timebasedrollingpolicy.h | 4 +-
.../include/log4cxx/rolling/triggeringpolicy.h | 4 +-
.../include/log4cxx/rolling/zipcompressaction.h | 2 +-
.../include/log4cxx/spi/appenderattachable.h | 2 +-
src/main/include/log4cxx/spi/filter.h | 2 +-
.../log4cxx/spi/hierarchyeventlistener.h | 4 +-
.../include/log4cxx/spi/location/locationinfo.h | 2 +-
src/main/include/log4cxx/spi/loggerfactory.h | 2 +-
src/main/include/log4cxx/spi/loggerrepository.h | 2 +-
src/main/include/log4cxx/spi/loggingevent.h | 12 +-
src/main/include/log4cxx/stream.h | 158 +++++++++----------
src/main/include/log4cxx/xml/domconfigurator.h | 8 +-
src/main/include/log4cxx/xml/xmllayout.h | 8 +-
136 files changed, 742 insertions(+), 742 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/appenderskeleton.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/appenderskeleton.cpp b/src/main/cpp/appenderskeleton.cpp
index 43ab5a1..7fc85d3 100644
--- a/src/main/cpp/appenderskeleton.cpp
+++ b/src/main/cpp/appenderskeleton.cpp
@@ -39,7 +39,7 @@ AppenderSkeleton::AppenderSkeleton()
errorHandler(new OnlyOnceErrorHandler()),
headFilter(),
tailFilter(),
- pool(),
+ pool(),
mutex(pool)
{
synchronized sync(mutex);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/asyncappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/asyncappender.cpp b/src/main/cpp/asyncappender.cpp
index 44732c2..77c8b5d 100644
--- a/src/main/cpp/asyncappender.cpp
+++ b/src/main/cpp/asyncappender.cpp
@@ -128,7 +128,7 @@ void AsyncAppender::append(const spi::LoggingEventPtr& event, Pool& p) {
}
break;
}
-
+
//
// Following code is only reachable if buffer is full
//
@@ -174,7 +174,7 @@ void AsyncAppender::append(const spi::LoggingEventPtr& event, Pool& p) {
appenders->appendLoopOnAppenders(event, p);
#endif
}
-
+
void AsyncAppender::close() {
{
@@ -183,7 +183,7 @@ void AsyncAppender::close() {
bufferNotEmpty.signalAll();
bufferNotFull.signalAll();
}
-
+
#if APR_HAS_THREADS
try {
dispatcher.join();
@@ -192,7 +192,7 @@ void AsyncAppender::close() {
LogLog::error(LOG4CXX_STR("Got an InterruptedException while waiting for the dispatcher to finish,"), e);
}
#endif
-
+
{
synchronized sync(appenders->getMutex());
AppenderList appenderList = appenders->getAllAppenders();
@@ -278,17 +278,17 @@ bool AsyncAppender::getBlocking() const {
return blocking;
}
-AsyncAppender::DiscardSummary::DiscardSummary(const LoggingEventPtr& event) :
+AsyncAppender::DiscardSummary::DiscardSummary(const LoggingEventPtr& event) :
maxEvent(event), count(1) {
}
-AsyncAppender::DiscardSummary::DiscardSummary(const DiscardSummary& src) :
+AsyncAppender::DiscardSummary::DiscardSummary(const DiscardSummary& src) :
maxEvent(src.maxEvent), count(src.count) {
}
AsyncAppender::DiscardSummary& AsyncAppender::DiscardSummary::operator=(const DiscardSummary& src) {
maxEvent = src.maxEvent;
- count = src.count;
+ count = src.count;
return *this;
}
@@ -303,8 +303,8 @@ LoggingEventPtr AsyncAppender::DiscardSummary::createEvent(Pool& p) {
LogString msg(LOG4CXX_STR("Discarded "));
StringHelper::toString(count, p, msg);
msg.append(LOG4CXX_STR(" messages due to a full event buffer including: "));
- msg.append(maxEvent->getMessage());
- return new LoggingEvent(
+ msg.append(maxEvent->getMessage());
+ return new LoggingEvent(
maxEvent->getLoggerName(),
maxEvent->getLevel(),
msg,
@@ -327,7 +327,7 @@ void* LOG4CXX_THREAD_FUNC AsyncAppender::dispatch(apr_thread_t* thread, void* da
synchronized sync(pThis->bufferMutex);
size_t bufferSize = pThis->buffer.size();
isActive = !pThis->closed;
-
+
while((bufferSize == 0) && isActive) {
pThis->bufferNotEmpty.await(pThis->bufferMutex);
bufferSize = pThis->buffer.size();
@@ -347,7 +347,7 @@ void* LOG4CXX_THREAD_FUNC AsyncAppender::dispatch(apr_thread_t* thread, void* da
pThis->discardMap->clear();
pThis->bufferNotFull.signalAll();
}
-
+
for (LoggingEventList::iterator iter = events.begin();
iter != events.end();
iter++) {
@@ -361,4 +361,4 @@ void* LOG4CXX_THREAD_FUNC AsyncAppender::dispatch(apr_thread_t* thread, void* da
}
return 0;
}
-#endif
+#endif
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/charsetdecoder.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/charsetdecoder.cpp b/src/main/cpp/charsetdecoder.cpp
index 19534c0..be7247e 100644
--- a/src/main/cpp/charsetdecoder.cpp
+++ b/src/main/cpp/charsetdecoder.cpp
@@ -122,7 +122,7 @@ namespace log4cxx
Mutex mutex;
apr_xlate_t *convset;
};
-
+
#endif
#if LOG4CXX_LOGCHAR_IS_WCHAR && LOG4CXX_HAS_MBSRTOWCS
@@ -365,12 +365,12 @@ private:
LogString& out) {
const char* p = in.current();
size_t i = in.position();
-#if !LOG4CXX_CHARSET_EBCDIC
+#if !LOG4CXX_CHARSET_EBCDIC
for (; i < in.limit() && ((unsigned int) *p) < 0x80; i++, p++) {
out.append(1, *p);
}
in.position(i);
-#endif
+#endif
if (i < in.limit()) {
Pool subpool;
const char* enc = apr_os_locale_encoding(subpool.getAPRPool());
@@ -392,9 +392,9 @@ private:
}
}
}
- return decoder->decode(in, out);
+ return decoder->decode(in, out);
}
- return APR_SUCCESS;
+ return APR_SUCCESS;
}
private:
Pool pool;
@@ -478,7 +478,7 @@ CharsetDecoderPtr CharsetDecoder::getDecoder(const LogString& charset) {
}
#if APR_HAS_XLATE || !defined(_WIN32)
return new APRCharsetDecoder(charset);
-#else
+#else
throw IllegalArgumentException(charset);
#endif
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/charsetencoder.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/charsetencoder.cpp b/src/main/cpp/charsetencoder.cpp
index a5a09c4..5a7089c 100644
--- a/src/main/cpp/charsetencoder.cpp
+++ b/src/main/cpp/charsetencoder.cpp
@@ -378,13 +378,13 @@ public:
char* current = out.current();
size_t remain = out.remaining();
for(;
- iter != in.end() && ((unsigned int) *iter) < 0x80 && remain > 0;
+ iter != in.end() && ((unsigned int) *iter) < 0x80 && remain > 0;
iter++, remain--, current++) {
*current = *iter;
}
out.position(current - out.data());
#endif
- if (iter != in.end() && out.remaining() > 0) {
+ if (iter != in.end() && out.remaining() > 0) {
Pool subpool;
const char* enc = apr_os_locale_encoding(subpool.getAPRPool());
{
@@ -438,7 +438,7 @@ CharsetEncoderPtr CharsetEncoder::getDefaultEncoder() {
// if invoked after static variable destruction
// (if logging is called in the destructor of a static object)
// then create a new decoder.
- //
+ //
if (encoder == 0) {
return createDefaultEncoder();
}
@@ -486,7 +486,7 @@ CharsetEncoderPtr CharsetEncoder::getEncoder(const LogString& charset) {
}
#if APR_HAS_XLATE || !defined(_WIN32)
return new APRCharsetEncoder(charset);
-#else
+#else
throw IllegalArgumentException(charset);
#endif
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/class.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/class.cpp b/src/main/cpp/class.cpp
index 423f877..74e36c3 100644
--- a/src/main/cpp/class.cpp
+++ b/src/main/cpp/class.cpp
@@ -148,7 +148,7 @@ bool Class::registerClass(const Class& newClass)
void Class::registerClasses() {
#if APR_HAS_THREADS
AsyncAppender::registerClass();
-#endif
+#endif
ConsoleAppender::registerClass();
FileAppender::registerClass();
log4cxx::db::ODBCAppender::registerClass();
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/defaultrepositoryselector.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/defaultrepositoryselector.cpp b/src/main/cpp/defaultrepositoryselector.cpp
index 3ef75ea..1085adb 100644
--- a/src/main/cpp/defaultrepositoryselector.cpp
+++ b/src/main/cpp/defaultrepositoryselector.cpp
@@ -26,13 +26,13 @@ DefaultRepositorySelector::DefaultRepositorySelector(const LoggerRepositoryPtr&
: repository(repository1) {
}
-void DefaultRepositorySelector::addRef() const {
- ObjectImpl::addRef();
+void DefaultRepositorySelector::addRef() const {
+ ObjectImpl::addRef();
}
-void DefaultRepositorySelector::releaseRef() const {
- ObjectImpl::releaseRef();
+void DefaultRepositorySelector::releaseRef() const {
+ ObjectImpl::releaseRef();
}
LoggerRepositoryPtr& DefaultRepositorySelector::getLoggerRepository() {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/domconfigurator.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/domconfigurator.cpp b/src/main/cpp/domconfigurator.cpp
index 8d66df4..707f295 100644
--- a/src/main/cpp/domconfigurator.cpp
+++ b/src/main/cpp/domconfigurator.cpp
@@ -278,7 +278,7 @@ Used internally to parse an {@link ErrorHandler} element.
*/
void DOMConfigurator::parseErrorHandler(Pool& p,
log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
- apr_xml_elem* element,
+ apr_xml_elem* element,
AppenderPtr& appender,
apr_xml_doc* doc,
AppenderMap& appenders)
@@ -326,9 +326,9 @@ void DOMConfigurator::parseErrorHandler(Pool& p,
/**
Used internally to parse a filter element.
*/
-void DOMConfigurator::parseFilters(Pool& p,
+void DOMConfigurator::parseFilters(Pool& p,
log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
- apr_xml_elem* element,
+ apr_xml_elem* element,
std::vector<log4cxx::spi::FilterPtr>& filters)
{
LogString clazz = subst(getAttribute(utf8Decoder, element, CLASS_ATTR));
@@ -359,8 +359,8 @@ Used internally to parse an category or logger element.
*/
void DOMConfigurator::parseLogger(
log4cxx::helpers::Pool& p,
- log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
- apr_xml_elem* loggerElement,
+ log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
+ apr_xml_elem* loggerElement,
apr_xml_doc* doc,
AppenderMap& appenders)
{
@@ -389,7 +389,7 @@ void DOMConfigurator::parseLogger(
*/
void DOMConfigurator::parseLoggerFactory(
log4cxx::helpers::Pool& p,
- log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
+ log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
apr_xml_elem* factoryElement)
{
LogString className(subst(getAttribute(utf8Decoder, factoryElement, CLASS_ATTR)));
@@ -424,9 +424,9 @@ void DOMConfigurator::parseLoggerFactory(
*/
void DOMConfigurator::parseRoot(
log4cxx::helpers::Pool& p,
- log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
- apr_xml_elem* rootElement,
- apr_xml_doc* doc,
+ log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
+ apr_xml_elem* rootElement,
+ apr_xml_doc* doc,
AppenderMap& appenders)
{
LoggerPtr root = repository->getRootLogger();
@@ -440,9 +440,9 @@ void DOMConfigurator::parseRoot(
*/
void DOMConfigurator::parseChildrenOfLoggerElement(
log4cxx::helpers::Pool& p,
- log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
+ log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
apr_xml_elem* loggerElement, LoggerPtr logger, bool isRoot,
- apr_xml_doc* doc,
+ apr_xml_doc* doc,
AppenderMap& appenders)
{
@@ -497,7 +497,7 @@ void DOMConfigurator::parseChildrenOfLoggerElement(
*/
LayoutPtr DOMConfigurator::parseLayout (
log4cxx::helpers::Pool& p,
- log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
+ log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
apr_xml_elem* layout_element)
{
LogString className(subst(getAttribute(utf8Decoder, layout_element, CLASS_ATTR)));
@@ -534,7 +534,7 @@ LayoutPtr DOMConfigurator::parseLayout (
*/
ObjectPtr DOMConfigurator::parseTriggeringPolicy (
log4cxx::helpers::Pool& p,
- log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
+ log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
apr_xml_elem* layout_element)
{
LogString className = subst(getAttribute(utf8Decoder, layout_element, CLASS_ATTR));
@@ -582,7 +582,7 @@ ObjectPtr DOMConfigurator::parseTriggeringPolicy (
*/
RollingPolicyPtr DOMConfigurator::parseRollingPolicy (
log4cxx::helpers::Pool& p,
- log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
+ log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
apr_xml_elem* layout_element)
{
LogString className = subst(getAttribute(utf8Decoder, layout_element, CLASS_ATTR));
@@ -621,7 +621,7 @@ RollingPolicyPtr DOMConfigurator::parseRollingPolicy (
*/
void DOMConfigurator::parseLevel(
log4cxx::helpers::Pool& p,
- log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
+ log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
apr_xml_elem* element, LoggerPtr logger, bool isRoot)
{
LogString loggerName = logger->getName();
@@ -689,7 +689,7 @@ void DOMConfigurator::parseLevel(
void DOMConfigurator::setParameter(log4cxx::helpers::Pool& p,
log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
- apr_xml_elem* elem,
+ apr_xml_elem* elem,
PropertySetter& propSetter)
{
LogString name(subst(getAttribute(utf8Decoder, elem, NAME_ATTR)));
@@ -809,7 +809,7 @@ void DOMConfigurator::configureAndWatch(const std::string& filename, long delay)
xdog->start();
#else
DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
-#endif
+#endif
}
#if LOG4CXX_WCHAR_T_API
@@ -822,7 +822,7 @@ void DOMConfigurator::configureAndWatch(const std::wstring& filename, long delay
xdog->start();
#else
DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
-#endif
+#endif
}
#endif
@@ -836,7 +836,7 @@ void DOMConfigurator::configureAndWatch(const std::basic_string<UniChar>& filena
xdog->start();
#else
DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
-#endif
+#endif
}
#endif
@@ -850,7 +850,7 @@ void DOMConfigurator::configureAndWatch(const CFStringRef& filename, long delay)
xdog->start();
#else
DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
-#endif
+#endif
}
#endif
@@ -954,7 +954,7 @@ LogString DOMConfigurator::subst(const LogString& value)
LogString DOMConfigurator::getAttribute(
log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
- apr_xml_elem* element,
+ apr_xml_elem* element,
const std::string& attrName) {
LogString attrValue;
for(apr_xml_attr* attr = element->attr;
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/exception.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/exception.cpp b/src/main/cpp/exception.cpp
index 19e17d0..7ac2bfb 100644
--- a/src/main/cpp/exception.cpp
+++ b/src/main/cpp/exception.cpp
@@ -353,7 +353,7 @@ IllegalStateException& IllegalStateException::operator=(const IllegalStateExcept
SocketException::SocketException(const LogString& msg) : IOException(msg) {
}
-SocketException::SocketException(log4cxx_status_t status) : IOException(status) {
+SocketException::SocketException(log4cxx_status_t status) : IOException(status) {
}
SocketException::SocketException(const SocketException& src)
@@ -365,7 +365,7 @@ SocketException& SocketException::operator=(const SocketException& src) {
return *this;
}
-ConnectException::ConnectException(log4cxx_status_t status) : SocketException(status) {
+ConnectException::ConnectException(log4cxx_status_t status) : SocketException(status) {
}
ConnectException::ConnectException(const ConnectException& src)
@@ -377,7 +377,7 @@ ConnectException& ConnectException::operator=(const ConnectException& src) {
return *this;
}
-ClosedChannelException::ClosedChannelException() : SocketException(LOG4CXX_STR("Attempt to write to closed socket")) {
+ClosedChannelException::ClosedChannelException() : SocketException(LOG4CXX_STR("Attempt to write to closed socket")) {
}
ClosedChannelException::ClosedChannelException(const ClosedChannelException& src)
@@ -389,7 +389,7 @@ ClosedChannelException& ClosedChannelException::operator=(const ClosedChannelExc
return *this;
}
-BindException::BindException(log4cxx_status_t status) : SocketException(status) {
+BindException::BindException(log4cxx_status_t status) : SocketException(status) {
}
BindException::BindException(const BindException& src)
@@ -401,7 +401,7 @@ BindException& BindException::operator=(const BindException& src) {
return *this;
}
-InterruptedIOException::InterruptedIOException(const LogString& msg) : IOException(msg) {
+InterruptedIOException::InterruptedIOException(const LogString& msg) : IOException(msg) {
}
InterruptedIOException::InterruptedIOException(const InterruptedIOException& src)
@@ -413,8 +413,8 @@ InterruptedIOException& InterruptedIOException::operator=(const InterruptedIOExc
return *this;
}
-SocketTimeoutException::SocketTimeoutException()
- : InterruptedIOException(LOG4CXX_STR("SocketTimeoutException")) {
+SocketTimeoutException::SocketTimeoutException()
+ : InterruptedIOException(LOG4CXX_STR("SocketTimeoutException")) {
}
SocketTimeoutException::SocketTimeoutException(const SocketTimeoutException& src)
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/file.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/file.cpp b/src/main/cpp/file.cpp
index 30ff411..3e9d087 100644
--- a/src/main/cpp/file.cpp
+++ b/src/main/cpp/file.cpp
@@ -30,7 +30,7 @@ using namespace log4cxx::helpers;
File::File() {
}
-template<class S>
+template<class S>
static LogString decodeLS(const S* src) {
LogString dst;
if (src != 0) {
@@ -39,7 +39,7 @@ static LogString decodeLS(const S* src) {
return dst;
}
-template<class S>
+template<class S>
static LogString decodeLS(const std::basic_string<S>& src) {
LogString dst;
Transcoder::decode(src, dst);
@@ -192,8 +192,8 @@ std::vector<LogString> File::list(Pool& p) const {
apr_finfo_t entry;
std::vector<LogString> filenames;
- apr_status_t stat = apr_dir_open(&dir,
- convertBackSlashes(getPath(p)),
+ apr_status_t stat = apr_dir_open(&dir,
+ convertBackSlashes(getPath(p)),
p.getAPRPool());
if(stat == APR_SUCCESS) {
int style = APR_FILEPATH_ENCODING_UNKNOWN;
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/fileappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/fileappender.cpp b/src/main/cpp/fileappender.cpp
index ae752ee..ddfe91c 100644
--- a/src/main/cpp/fileappender.cpp
+++ b/src/main/cpp/fileappender.cpp
@@ -43,9 +43,9 @@ FileAppender::FileAppender() {
}
FileAppender::FileAppender(const LayoutPtr& layout1, const LogString& fileName1,
- bool append1, bool bufferedIO1, int bufferSize1)
+ bool append1, bool bufferedIO1, int bufferSize1)
: WriterAppender(layout1) {
- {
+ {
synchronized sync(mutex);
fileAppend = append1;
fileName = fileName1;
@@ -88,9 +88,9 @@ FileAppender::~FileAppender()
finalize();
}
-void FileAppender::setAppend(bool fileAppend1) {
+void FileAppender::setAppend(bool fileAppend1) {
synchronized sync(mutex);
- this->fileAppend = fileAppend1;
+ this->fileAppend = fileAppend1;
}
void FileAppender::setFile(const LogString& file)
@@ -182,7 +182,7 @@ void FileAppender::activateOptions(Pool& p)
*
* @param src source string
* @return modified string
- *
+ *
*
*/
LogString FileAppender::stripDuplicateBackslashes(const LogString& src) {
@@ -281,8 +281,8 @@ void FileAppender::setFile(
throw ex;
}
}
-
-
+
+
//
// if a new file and UTF-16, then write a BOM
//
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/fileinputstream.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/fileinputstream.cpp b/src/main/cpp/fileinputstream.cpp
index 24dae1a..6061d63 100644
--- a/src/main/cpp/fileinputstream.cpp
+++ b/src/main/cpp/fileinputstream.cpp
@@ -81,7 +81,7 @@ void FileInputStream::close() {
int FileInputStream::read(ByteBuffer& buf) {
apr_size_t bytesRead = buf.remaining();
apr_status_t stat = apr_file_read(fileptr, buf.current(), &bytesRead);
- int retval = -1;
+ int retval = -1;
if (!APR_STATUS_IS_EOF(stat)) {
if (stat != APR_SUCCESS) {
throw IOException(stat);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/gzcompressaction.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/gzcompressaction.cpp b/src/main/cpp/gzcompressaction.cpp
index f43f5d0..2b30b6d 100644
--- a/src/main/cpp/gzcompressaction.cpp
+++ b/src/main/cpp/gzcompressaction.cpp
@@ -39,10 +39,10 @@ bool GZCompressAction::execute(log4cxx::helpers::Pool& p) const {
apr_procattr_t* attr;
apr_status_t stat = apr_procattr_create(&attr, pool);
if (stat != APR_SUCCESS) throw IOException(stat);
-
+
stat = apr_procattr_io_set(attr, APR_NO_PIPE, APR_FULL_BLOCK, APR_FULL_BLOCK);
if (stat != APR_SUCCESS) throw IOException(stat);
-
+
stat = apr_procattr_cmdtype_set(attr, APR_PROGRAM_PATH);
if (stat != APR_SUCCESS) throw IOException(stat);
@@ -68,14 +68,14 @@ bool GZCompressAction::execute(log4cxx::helpers::Pool& p) const {
if (stat != APR_SUCCESS) throw IOException(stat);
}
- const char** args = (const char**)
+ const char** args = (const char**)
apr_palloc(pool, 4 *sizeof(*args));
int i = 0;
args[i++] = "gzip";
args[i++] = "-c";
args[i++] = Transcoder::encode(source.getPath(), p);
args[i++] = NULL;
-
+
apr_proc_t pid;
stat = apr_proc_create(&pid, "gzip", args, NULL, attr, pool);
@@ -84,7 +84,7 @@ bool GZCompressAction::execute(log4cxx::helpers::Pool& p) const {
apr_proc_wait(&pid, NULL, NULL, APR_WAIT);
stat = apr_file_close(child_out);
if (stat != APR_SUCCESS) throw IOException(stat);
-
+
if (deleteSource) {
source.deleteFile(p);
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/hierarchy.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/hierarchy.cpp b/src/main/cpp/hierarchy.cpp
index ed40421..88fc4f7 100644
--- a/src/main/cpp/hierarchy.cpp
+++ b/src/main/cpp/hierarchy.cpp
@@ -17,7 +17,7 @@
#if defined(_MSC_VER)
#pragma warning ( disable: 4231 4251 4275 4786 )
-#endif
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/spi/loggerfactory.h>
@@ -48,7 +48,7 @@ using namespace log4cxx::helpers;
IMPLEMENT_LOG4CXX_OBJECT(Hierarchy)
-Hierarchy::Hierarchy() :
+Hierarchy::Hierarchy() :
pool(),
mutex(pool),
loggers(new LoggerMap()),
@@ -101,12 +101,12 @@ void Hierarchy::clear()
void Hierarchy::emitNoAppenderWarning(const LoggerPtr& logger)
{
bool emitWarning = false;
- {
+ {
synchronized sync(mutex);
emitWarning = !emittedNoAppenderWarning;
emittedNoAppenderWarning = true;
}
-
+
// No appender in hierarchy, warn user only once.
if(emitWarning)
{
@@ -163,7 +163,7 @@ void Hierarchy::fireAddAppenderEvent(const LoggerPtr& logger, const AppenderPtr&
{
setConfigured(true);
HierarchyEventListenerList clonedList;
- {
+ {
synchronized sync(mutex);
clonedList = listeners;
}
@@ -182,7 +182,7 @@ void Hierarchy::fireRemoveAppenderEvent(const LoggerPtr& logger, const AppenderP
{
HierarchyEventListenerList clonedList;
- {
+ {
synchronized sync(mutex);
clonedList = listeners;
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/inetaddress.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/inetaddress.cpp b/src/main/cpp/inetaddress.cpp
index a0cce3c..65f4c69 100644
--- a/src/main/cpp/inetaddress.cpp
+++ b/src/main/cpp/inetaddress.cpp
@@ -45,7 +45,7 @@ UnknownHostException& UnknownHostException::operator=(const UnknownHostException
}
-InetAddress::InetAddress(const LogString& hostName, const LogString& hostAddr)
+InetAddress::InetAddress(const LogString& hostName, const LogString& hostAddr)
: ipAddrString(hostAddr), hostNameString(hostName) {
}
@@ -59,7 +59,7 @@ std::vector<InetAddressPtr> InetAddress::getAllByName(const LogString& host) {
Pool addrPool;
apr_sockaddr_t *address = 0;
- apr_status_t status =
+ apr_status_t status =
apr_sockaddr_info_get(&address, encodedHost.c_str(),
APR_INET, 0, 0, addrPool.getAPRPool());
if (status != APR_SUCCESS) {
@@ -80,7 +80,7 @@ std::vector<InetAddressPtr> InetAddress::getAllByName(const LogString& host) {
std::string ip(ipAddr);
Transcoder::decode(ip, ipAddrString);
}
-
+
// retrieve the host name of this InetAddress.
LogString hostNameString;
char *hostName;
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/inputstreamreader.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/inputstreamreader.cpp b/src/main/cpp/inputstreamreader.cpp
index 52b1c0a..2f78490 100644
--- a/src/main/cpp/inputstreamreader.cpp
+++ b/src/main/cpp/inputstreamreader.cpp
@@ -33,7 +33,7 @@ InputStreamReader::InputStreamReader(const InputStreamPtr& in1)
}
}
-InputStreamReader::InputStreamReader(const InputStreamPtr& in1, const CharsetDecoderPtr &dec1)
+InputStreamReader::InputStreamReader(const InputStreamPtr& in1, const CharsetDecoderPtr &dec1)
: in(in1), dec(dec1) {
if (in1 == 0) {
throw NullPointerException(LOG4CXX_STR("in parameter may not be null."));
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/layout.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/layout.cpp b/src/main/cpp/layout.cpp
index 8f75554..1490938 100644
--- a/src/main/cpp/layout.cpp
+++ b/src/main/cpp/layout.cpp
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/locationinfo.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/locationinfo.cpp b/src/main/cpp/locationinfo.cpp
index e76ea29..07ecb13 100644
--- a/src/main/cpp/locationinfo.cpp
+++ b/src/main/cpp/locationinfo.cpp
@@ -149,16 +149,16 @@ void LocationInfo::write(ObjectOutputStream& os, Pool& p) const {
os.writeNull(p);
} else {
char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
- 0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F,
- 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB,
- 0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01,
- 0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49,
- 0x6E, 0x66, 0x6F,
- 0x74, 0x00, 0x12, 0x4C, 0x6A,
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
+ 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
+ 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
+ 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
+ 0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F,
+ 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB,
+ 0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01,
+ 0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49,
+ 0x6E, 0x66, 0x6F,
+ 0x74, 0x00, 0x12, 0x4C, 0x6A,
+ 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
0x78, 0x70 };
os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/logger.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/logger.cpp b/src/main/cpp/logger.cpp
index 2fcb044..ccda903 100644
--- a/src/main/cpp/logger.cpp
+++ b/src/main/cpp/logger.cpp
@@ -81,8 +81,8 @@ void Logger::callAppenders(const spi::LoggingEventPtr& event, Pool& p) const
{
int writes = 0;
- for(LoggerPtr logger(const_cast<Logger*>(this));
- logger != 0;
+ for(LoggerPtr logger(const_cast<Logger*>(this));
+ logger != 0;
logger = logger->parent)
{
// Protected against simultaneous call to addAppender, removeAppender,...
@@ -210,7 +210,7 @@ ResourceBundlePtr Logger::getResourceBundle() const
}
-LogString Logger::getResourceBundleString(const LogString& key) const
+LogString Logger::getResourceBundleString(const LogString& key) const
{
ResourceBundlePtr rb = getResourceBundle();
@@ -403,7 +403,7 @@ void Logger::l7dlog(const LevelPtr& level1, const std::string& key,
}
void Logger::l7dlog(const LevelPtr& level1, const std::string& key,
- const LocationInfo& location,
+ const LocationInfo& location,
const std::string& val1, const std::string& val2) const {
LOG4CXX_DECODE_CHAR(lkey, key);
LOG4CXX_DECODE_CHAR(lval1, val1);
@@ -416,7 +416,7 @@ void Logger::l7dlog(const LevelPtr& level1, const std::string& key,
}
void Logger::l7dlog(const LevelPtr& level1, const std::string& key,
- const LocationInfo& location,
+ const LocationInfo& location,
const std::string& val1, const std::string& val2, const std::string& val3) const {
LOG4CXX_DECODE_CHAR(lkey, key);
LOG4CXX_DECODE_CHAR(lval1, val1);
@@ -513,18 +513,18 @@ void Logger::getName(std::string& rv) const {
}
-void Logger::trace(const std::string& msg, const log4cxx::spi::LocationInfo& location) const {
- if (isTraceEnabled()) {
- forcedLog(log4cxx::Level::getTrace(), msg, location);
- }
-}
+void Logger::trace(const std::string& msg, const log4cxx::spi::LocationInfo& location) const {
+ if (isTraceEnabled()) {
+ forcedLog(log4cxx::Level::getTrace(), msg, location);
+ }
+}
-void Logger::trace(const std::string& msg) const {
- if (isTraceEnabled()) {
- forcedLog(log4cxx::Level::getTrace(), msg);
- }
-}
+void Logger::trace(const std::string& msg) const {
+ if (isTraceEnabled()) {
+ forcedLog(log4cxx::Level::getTrace(), msg);
+ }
+}
void Logger::debug(const std::string& msg, const log4cxx::spi::LocationInfo& location) const {
if (isDebugEnabled()) {
@@ -648,18 +648,18 @@ LoggerPtr Logger::getLogger(const wchar_t* const name)
return LogManager::getLogger(name);
}
-void Logger::trace(const std::wstring& msg, const log4cxx::spi::LocationInfo& location) const {
- if (isTraceEnabled()) {
- forcedLog(log4cxx::Level::getTrace(), msg, location);
- }
-}
+void Logger::trace(const std::wstring& msg, const log4cxx::spi::LocationInfo& location) const {
+ if (isTraceEnabled()) {
+ forcedLog(log4cxx::Level::getTrace(), msg, location);
+ }
+}
-void Logger::trace(const std::wstring& msg) const {
- if (isTraceEnabled()) {
- forcedLog(log4cxx::Level::getTrace(), msg);
- }
-}
+void Logger::trace(const std::wstring& msg) const {
+ if (isTraceEnabled()) {
+ forcedLog(log4cxx::Level::getTrace(), msg);
+ }
+}
void Logger::debug(const std::wstring& msg, const log4cxx::spi::LocationInfo& location) const {
if (isDebugEnabled()) {
@@ -767,18 +767,18 @@ LoggerPtr Logger::getLogger(const std::basic_string<UniChar>& name)
return LogManager::getLogger(name);
}
-void Logger::trace(const std::basic_string<UniChar>& msg, const log4cxx::spi::LocationInfo& location) const {
- if (isTraceEnabled()) {
- forcedLog(log4cxx::Level::getTrace(), msg, location);
- }
-}
+void Logger::trace(const std::basic_string<UniChar>& msg, const log4cxx::spi::LocationInfo& location) const {
+ if (isTraceEnabled()) {
+ forcedLog(log4cxx::Level::getTrace(), msg, location);
+ }
+}
-void Logger::trace(const std::basic_string<UniChar>& msg) const {
- if (isTraceEnabled()) {
- forcedLog(log4cxx::Level::getTrace(), msg);
- }
-}
+void Logger::trace(const std::basic_string<UniChar>& msg) const {
+ if (isTraceEnabled()) {
+ forcedLog(log4cxx::Level::getTrace(), msg);
+ }
+}
void Logger::debug(const std::basic_string<UniChar>& msg, const log4cxx::spi::LocationInfo& location) const {
if (isDebugEnabled()) {
@@ -884,18 +884,18 @@ LoggerPtr Logger::getLogger(const CFStringRef& name)
return LogManager::getLogger(name);
}
-void Logger::trace(const CFStringRef& msg, const log4cxx::spi::LocationInfo& location) const {
- if (isTraceEnabled()) {
- forcedLog(log4cxx::Level::getTrace(), msg, location);
- }
-}
+void Logger::trace(const CFStringRef& msg, const log4cxx::spi::LocationInfo& location) const {
+ if (isTraceEnabled()) {
+ forcedLog(log4cxx::Level::getTrace(), msg, location);
+ }
+}
-void Logger::trace(const CFStringRef& msg) const {
- if (isTraceEnabled()) {
- forcedLog(log4cxx::Level::getTrace(), msg);
- }
-}
+void Logger::trace(const CFStringRef& msg) const {
+ if (isTraceEnabled()) {
+ forcedLog(log4cxx::Level::getTrace(), msg);
+ }
+}
void Logger::debug(const CFStringRef& msg, const log4cxx::spi::LocationInfo& location) const {
if (isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/loggingevent.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/loggingevent.cpp b/src/main/cpp/loggingevent.cpp
index 1c0d4be..a7783fb 100644
--- a/src/main/cpp/loggingevent.cpp
+++ b/src/main/cpp/loggingevent.cpp
@@ -237,61 +237,61 @@ void LoggingEvent::setProperty(const LogString& key, const LogString& value)
void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
- 0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67,
- 0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E,
- 0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5,
- 0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D,
- 0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F,
- 0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75,
- 0x69, 0x72, 0x65, 0x64, 0x5A, 0x00, 0x11, 0x6E,
- 0x64, 0x63, 0x4C, 0x6F, 0x6F, 0x6B, 0x75, 0x70,
- 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64,
- 0x4A, 0x00, 0x09, 0x74, 0x69, 0x6D, 0x65, 0x53,
- 0x74, 0x61, 0x6D, 0x70, 0x4C, 0x00, 0x0C, 0x63,
- 0x61, 0x74, 0x65, 0x67, 0x6F, 0x72, 0x79, 0x4E,
- 0x61, 0x6D, 0x65, 0x74, 0x00, 0x12, 0x4C, 0x6A,
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x4C, 0x00, 0x0C, 0x6C, 0x6F, 0x63, 0x61, 0x74,
- 0x69, 0x6F, 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0x74,
- 0x00, 0x23, 0x4C, 0x6F, 0x72, 0x67, 0x2F, 0x61,
- 0x70, 0x61, 0x63, 0x68, 0x65, 0x2F, 0x6C, 0x6F,
- 0x67, 0x34, 0x6A, 0x2F, 0x73, 0x70, 0x69, 0x2F,
- 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E,
- 0x49, 0x6E, 0x66, 0x6F, 0x3B, 0x4C, 0x00, 0x07,
- 0x6D, 0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x74,
- 0x00, 0x15, 0x4C, 0x6A, 0x61, 0x76, 0x61, 0x2F,
- 0x75, 0x74, 0x69, 0x6C, 0x2F, 0x48, 0x61, 0x73,
- 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x3B, 0x4C,
- 0x00, 0x03, 0x6E, 0x64, 0x63,
- 0x74, 0x00, 0x12, 0x4C, 0x6A,
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
+ 0x72, 0x00, 0x21,
+ 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
+ 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
+ 0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67,
+ 0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E,
+ 0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5,
+ 0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D,
+ 0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F,
+ 0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75,
+ 0x69, 0x72, 0x65, 0x64, 0x5A, 0x00, 0x11, 0x6E,
+ 0x64, 0x63, 0x4C, 0x6F, 0x6F, 0x6B, 0x75, 0x70,
+ 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64,
+ 0x4A, 0x00, 0x09, 0x74, 0x69, 0x6D, 0x65, 0x53,
+ 0x74, 0x61, 0x6D, 0x70, 0x4C, 0x00, 0x0C, 0x63,
+ 0x61, 0x74, 0x65, 0x67, 0x6F, 0x72, 0x79, 0x4E,
+ 0x61, 0x6D, 0x65, 0x74, 0x00, 0x12, 0x4C, 0x6A,
+ 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x4C, 0x00, 0x0F, 0x72, 0x65, 0x6E,
- 0x64, 0x65, 0x72, 0x65, 0x64, 0x4D, 0x65, 0x73,
- 0x73, 0x61, 0x67, 0x65,
- 0x74, 0x00, 0x12, 0x4C, 0x6A,
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
+ 0x4C, 0x00, 0x0C, 0x6C, 0x6F, 0x63, 0x61, 0x74,
+ 0x69, 0x6F, 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0x74,
+ 0x00, 0x23, 0x4C, 0x6F, 0x72, 0x67, 0x2F, 0x61,
+ 0x70, 0x61, 0x63, 0x68, 0x65, 0x2F, 0x6C, 0x6F,
+ 0x67, 0x34, 0x6A, 0x2F, 0x73, 0x70, 0x69, 0x2F,
+ 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E,
+ 0x49, 0x6E, 0x66, 0x6F, 0x3B, 0x4C, 0x00, 0x07,
+ 0x6D, 0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x74,
+ 0x00, 0x15, 0x4C, 0x6A, 0x61, 0x76, 0x61, 0x2F,
+ 0x75, 0x74, 0x69, 0x6C, 0x2F, 0x48, 0x61, 0x73,
+ 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x3B, 0x4C,
+ 0x00, 0x03, 0x6E, 0x64, 0x63,
+ 0x74, 0x00, 0x12, 0x4C, 0x6A,
+ 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x4C, 0x00, 0x0A, 0x74, 0x68, 0x72, 0x65,
- 0x61, 0x64, 0x4E, 0x61, 0x6D, 0x65,
- 0x74, 0x00, 0x12, 0x4C, 0x6A,
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
+ 0x4C, 0x00, 0x0F, 0x72, 0x65, 0x6E,
+ 0x64, 0x65, 0x72, 0x65, 0x64, 0x4D, 0x65, 0x73,
+ 0x73, 0x61, 0x67, 0x65,
+ 0x74, 0x00, 0x12, 0x4C, 0x6A,
+ 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x4C, 0x00, 0x0D, 0x74, 0x68,
- 0x72, 0x6F, 0x77, 0x61, 0x62, 0x6C, 0x65, 0x49,
- 0x6E, 0x66, 0x6F, 0x74, 0x00, 0x2B, 0x4C, 0x6F,
- 0x72, 0x67, 0x2F, 0x61, 0x70, 0x61, 0x63, 0x68,
- 0x65, 0x2F, 0x6C, 0x6F, 0x67, 0x34, 0x6A, 0x2F,
- 0x73, 0x70, 0x69, 0x2F, 0x54, 0x68, 0x72, 0x6F,
- 0x77, 0x61, 0x62, 0x6C, 0x65, 0x49, 0x6E, 0x66,
- 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x69, 0x6F, 0x6E,
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
+ 0x4C, 0x00, 0x0A, 0x74, 0x68, 0x72, 0x65,
+ 0x61, 0x64, 0x4E, 0x61, 0x6D, 0x65,
+ 0x74, 0x00, 0x12, 0x4C, 0x6A,
+ 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
+ 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
+ 0x4C, 0x00, 0x0D, 0x74, 0x68,
+ 0x72, 0x6F, 0x77, 0x61, 0x62, 0x6C, 0x65, 0x49,
+ 0x6E, 0x66, 0x6F, 0x74, 0x00, 0x2B, 0x4C, 0x6F,
+ 0x72, 0x67, 0x2F, 0x61, 0x70, 0x61, 0x63, 0x68,
+ 0x65, 0x2F, 0x6C, 0x6F, 0x67, 0x34, 0x6A, 0x2F,
+ 0x73, 0x70, 0x69, 0x2F, 0x54, 0x68, 0x72, 0x6F,
+ 0x77, 0x61, 0x62, 0x6C, 0x65, 0x49, 0x6E, 0x66,
+ 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x69, 0x6F, 0x6E,
+ 0x3B, 0x78, 0x70 };
+
+ os.writeProlog("org.apache.log4j.spi.LoggingEvent",
8, classDesc, sizeof(classDesc), p);
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/logstream.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/logstream.cpp b/src/main/cpp/logstream.cpp
index ebf4a38..c3bc955 100644
--- a/src/main/cpp/logstream.cpp
+++ b/src/main/cpp/logstream.cpp
@@ -25,7 +25,7 @@
using namespace log4cxx;
-logstream_base::logstream_ios_base::logstream_ios_base(std::ios_base::fmtflags initval,
+logstream_base::logstream_ios_base::logstream_ios_base(std::ios_base::fmtflags initval,
int initsize) {
#if LOG4CXX_MEMSET_IOS_BASE
//
@@ -37,12 +37,12 @@ logstream_base::logstream_ios_base::logstream_ios_base(std::ios_base::fmtflags i
flags(initval);
precision(initsize);
width(initsize);
-
+
}
logstream_base::logstream_base(const LoggerPtr& log,
- const LevelPtr& lvl) : initset((std::ios_base::fmtflags) -1, 1),
+ const LevelPtr& lvl) : initset((std::ios_base::fmtflags) -1, 1),
initclear((std::ios_base::fmtflags) 0, 0), fillchar(0), fillset(false), logger(log), level(lvl), location() {
enabled = logger->isEnabledFor(level);
}
@@ -153,7 +153,7 @@ std::ios_base::fmtflags logstream_base::setf(std::ios_base::fmtflags newflags) {
refresh_stream_state();
return oldVal;
}
-
+
void logstream_base::setLevel(const ::log4cxx::LevelPtr& newlevel) {
@@ -180,17 +180,17 @@ void logstream_base::setLocation(const log4cxx::spi::LocationInfo& newlocation)
logstream::logstream(const log4cxx::LoggerPtr& logger,
const log4cxx::LevelPtr& level) : logstream_base(logger, level), stream(0) {
}
-
-logstream::logstream(const Ch* loggerName,
- const log4cxx::LevelPtr& level)
+
+logstream::logstream(const Ch* loggerName,
+ const log4cxx::LevelPtr& level)
: logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
-logstream::logstream(const std::basic_string<Ch>& loggerName,
+logstream::logstream(const std::basic_string<Ch>& loggerName,
const log4cxx::LevelPtr& level) : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
-
+
logstream::~logstream() {
delete stream;
}
@@ -214,12 +214,12 @@ logstream& logstream::operator>>(const log4cxx::spi::LocationInfo& newlocation)
setLocation(newlocation);
return *this;
}
-
+
logstream& logstream::operator<<(std::ios_base& (*manip)(std::ios_base&)) {
logstream_base::insert(manip);
return *this;
}
-
+
logstream::operator std::basic_ostream<char>&() {
if (stream == 0) {
stream = new std::basic_stringstream<Ch>();
@@ -238,7 +238,7 @@ void logstream::log(LoggerPtr& logger,
}
}
}
-
+
void logstream::erase() {
if (stream != 0) {
@@ -246,7 +246,7 @@ void logstream::erase() {
stream->str(emptyStr);
}
}
-
+
void logstream::get_stream_state(std::ios_base& base,
std::ios_base& mask,
@@ -275,24 +275,24 @@ void logstream::refresh_stream_state() {
}
}
}
-
+
#if LOG4CXX_WCHAR_T_API
wlogstream::wlogstream(const log4cxx::LoggerPtr& logger,
const log4cxx::LevelPtr& level) : logstream_base(logger, level), stream(0) {
}
-
-wlogstream::wlogstream(const Ch* loggerName,
- const log4cxx::LevelPtr& level)
+
+wlogstream::wlogstream(const Ch* loggerName,
+ const log4cxx::LevelPtr& level)
: logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
-wlogstream::wlogstream(const std::basic_string<Ch>& loggerName,
+wlogstream::wlogstream(const std::basic_string<Ch>& loggerName,
const log4cxx::LevelPtr& level) : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
-
+
wlogstream::~wlogstream() {
delete stream;
}
@@ -319,12 +319,12 @@ wlogstream& wlogstream::operator>>(const log4cxx::spi::LocationInfo& newlocation
-
+
wlogstream& wlogstream::operator<<(std::ios_base& (*manip)(std::ios_base&)) {
logstream_base::insert(manip);
return *this;
}
-
+
wlogstream::operator std::basic_ostream<wchar_t>&() {
if (stream == 0) {
stream = new std::basic_stringstream<Ch>();
@@ -343,7 +343,7 @@ void wlogstream::log(LoggerPtr& logger,
}
}
}
-
+
void wlogstream::erase() {
if (stream != 0) {
@@ -351,7 +351,7 @@ void wlogstream::erase() {
stream->str(emptyStr);
}
}
-
+
void wlogstream::get_stream_state(std::ios_base& base,
std::ios_base& mask,
@@ -383,34 +383,34 @@ void wlogstream::refresh_stream_state() {
#endif
#if LOG4CXX_UNICHAR_API
-ulogstream::ulogstream(const Ch* loggerName,
- const log4cxx::LevelPtr& level)
+ulogstream::ulogstream(const Ch* loggerName,
+ const log4cxx::LevelPtr& level)
: logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
-ulogstream::ulogstream(const std::basic_string<Ch>& loggerName,
+ulogstream::ulogstream(const std::basic_string<Ch>& loggerName,
const log4cxx::LevelPtr& level) : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
#endif
#if LOG4CXX_CFSTRING_API
-ulogstream::ulogstream(const CFStringRef& loggerName,
- const log4cxx::LevelPtr& level)
+ulogstream::ulogstream(const CFStringRef& loggerName,
+ const log4cxx::LevelPtr& level)
: logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
#endif
-
+
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
ulogstream::ulogstream(const log4cxx::LoggerPtr& logger,
const log4cxx::LevelPtr& level) : logstream_base(logger, level), stream(0) {
}
-
-
-
+
+
+
ulogstream::~ulogstream() {
delete stream;
}
@@ -437,12 +437,12 @@ ulogstream& ulogstream::operator>>(const log4cxx::spi::LocationInfo& newlocation
-
+
ulogstream& ulogstream::operator<<(std::ios_base& (*manip)(std::ios_base&)) {
logstream_base::insert(manip);
return *this;
}
-
+
ulogstream::operator std::basic_ostream<UniChar>&() {
if (stream == 0) {
stream = new std::basic_stringstream<Ch>();
@@ -462,7 +462,7 @@ void ulogstream::log(LoggerPtr& logger,
}
}
}
-
+
void ulogstream::erase() {
if (stream != 0) {
@@ -470,7 +470,7 @@ void ulogstream::erase() {
stream->str(emptyStr);
}
}
-
+
void ulogstream::get_stream_state(std::ios_base& base,
std::ios_base& mask,
@@ -500,5 +500,5 @@ void ulogstream::refresh_stream_state() {
}
}
#endif
-
+
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/messagebuffer.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/messagebuffer.cpp b/src/main/cpp/messagebuffer.cpp
index 42a6439..04d571e 100644
--- a/src/main/cpp/messagebuffer.cpp
+++ b/src/main/cpp/messagebuffer.cpp
@@ -189,7 +189,7 @@ std::basic_ostream<wchar_t>& WideMessageBuffer::operator<<(void* val) { return (
MessageBuffer::MessageBuffer() : wbuf(0)
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
, ubuf(0)
-#endif
+#endif
{
}
@@ -197,14 +197,14 @@ MessageBuffer::~MessageBuffer() {
delete wbuf;
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
delete ubuf;
-#endif
+#endif
}
bool MessageBuffer::hasStream() const {
bool retval = cbuf.hasStream() || (wbuf != 0 && wbuf->hasStream());
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
- retval = retval || (ubuf != 0 && ubuf->hasStream());
-#endif
+ retval = retval || (ubuf != 0 && ubuf->hasStream());
+#endif
return retval;
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/nteventlogappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/nteventlogappender.cpp b/src/main/cpp/nteventlogappender.cpp
index 363b015..8caef9b 100644
--- a/src/main/cpp/nteventlogappender.cpp
+++ b/src/main/cpp/nteventlogappender.cpp
@@ -233,15 +233,15 @@ void NTEventLogAppender::addRegistryInfo()
DWORD modlen = GetModuleFileNameW(hmodule, modpath, _MAX_PATH - 1);
if (modlen > 0) {
modpath[modlen] = 0;
- RegSetValueExW(hkey, L"EventMessageFile", 0, REG_SZ,
+ RegSetValueExW(hkey, L"EventMessageFile", 0, REG_SZ,
(LPBYTE) modpath, wcslen(modpath) * sizeof(wchar_t));
- RegSetValueExW(hkey, L"CategoryMessageFile", 0, REG_SZ,
+ RegSetValueExW(hkey, L"CategoryMessageFile", 0, REG_SZ,
(LPBYTE) modpath, wcslen(modpath) * sizeof(wchar_t));
DWORD typesSupported = 7;
DWORD categoryCount = 6;
- RegSetValueExW(hkey, L"TypesSupported", 0, REG_DWORD,
+ RegSetValueExW(hkey, L"TypesSupported", 0, REG_DWORD,
(LPBYTE)&typesSupported, sizeof(DWORD));
- RegSetValueExW(hkey, L"CategoryCount", 0, REG_DWORD,
+ RegSetValueExW(hkey, L"CategoryCount", 0, REG_DWORD,
(LPBYTE)&categoryCount, sizeof(DWORD));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/objectoutputstream.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/objectoutputstream.cpp b/src/main/cpp/objectoutputstream.cpp
index 7cd696b..877174b 100644
--- a/src/main/cpp/objectoutputstream.cpp
+++ b/src/main/cpp/objectoutputstream.cpp
@@ -31,8 +31,8 @@ using namespace log4cxx::helpers;
IMPLEMENT_LOG4CXX_OBJECT(ObjectOutputStream)
ObjectOutputStream::ObjectOutputStream(OutputStreamPtr outputStream, Pool& p)
- : os(outputStream) ,
- utf8Encoder(CharsetEncoder::getUTF8Encoder()),
+ : os(outputStream) ,
+ utf8Encoder(CharsetEncoder::getUTF8Encoder()),
objectHandle(0x7E0000),
classDescriptions(new ClassDescriptionMap())
{
@@ -59,13 +59,13 @@ void ObjectOutputStream::writeObject(const LogString& val, Pool& p) {
char bytes[2];
#if LOG4CXX_LOGCHAR_IS_UTF8
size_t len = val.size();
- ByteBuffer dataBuf(const_cast<char*>(val.data()), val.size());
+ ByteBuffer dataBuf(const_cast<char*>(val.data()), val.size());
#else
size_t maxSize = 6 * val.size();
char* data = p.pstralloc(maxSize);
ByteBuffer dataBuf(data, maxSize);
LogString::const_iterator iter(val.begin());
- utf8Encoder->encode(val, iter, dataBuf);
+ utf8Encoder->encode(val, iter, dataBuf);
dataBuf.flip();
size_t len = dataBuf.limit();
#endif
@@ -82,18 +82,18 @@ void ObjectOutputStream::writeObject(const MDC::Map& val, Pool& p) {
// TC_OBJECT and the classDesc for java.util.Hashtable
//
char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
- 0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03,
- 0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61,
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
+ 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
+ 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
+ 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
+ 0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03,
+ 0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61,
+ 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
+ 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
0x6F, 0x6C, 0x64, 0x78, 0x70 };
writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
//
// loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
+ char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
TC_BLOCKDATA, 0x08, 0x00, 0x00, 0x00, 0x07 };
ByteBuffer dataBuf(data, sizeof(data));
os->write(dataBuf, p);
@@ -117,7 +117,7 @@ void ObjectOutputStream::writeObject(const MDC::Map& val, Pool& p) {
void ObjectOutputStream::writeUTFString(const std::string& val, Pool& p) {
char bytes[3];
size_t len = val.size();
- ByteBuffer dataBuf(const_cast<char*>(val.data()), val.size());
+ ByteBuffer dataBuf(const_cast<char*>(val.data()), val.size());
objectHandle++;
bytes[0] = 0x74;
bytes[1] = (char) ((len >> 8) & 0xFF);
@@ -191,4 +191,4 @@ void ObjectOutputStream::writeProlog(const char* className,
os->write(buf, p);
objectHandle += (classDescIncrement + 1);
}
-}
+}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/obsoleterollingfileappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/obsoleterollingfileappender.cpp b/src/main/cpp/obsoleterollingfileappender.cpp
index 2b218e6..5303d5f 100644
--- a/src/main/cpp/obsoleterollingfileappender.cpp
+++ b/src/main/cpp/obsoleterollingfileappender.cpp
@@ -30,7 +30,7 @@ using namespace log4cxx::helpers;
using namespace log4cxx::spi;
namespace log4cxx {
- class ClassRollingFileAppender : public Class
+ class ClassRollingFileAppender : public Class
{
public:
ClassRollingFileAppender() : helpers::Class() {}
@@ -44,16 +44,16 @@ namespace log4cxx {
}
const log4cxx::helpers::Class& RollingFileAppender::getClass() const { return getStaticClass(); }
-const log4cxx::helpers::Class& RollingFileAppender::getStaticClass() {
+const log4cxx::helpers::Class& RollingFileAppender::getStaticClass() {
static ClassRollingFileAppender theClass;
return theClass;
-}
+}
const log4cxx::helpers::ClassRegistration& RollingFileAppender::registerClass() {
static log4cxx::helpers::ClassRegistration classReg(RollingFileAppender::getStaticClass);
return classReg;
}
namespace log4cxx { namespace classes {
-const log4cxx::helpers::ClassRegistration& ObsoleteRollingFileAppenderRegistration =
+const log4cxx::helpers::ClassRegistration& ObsoleteRollingFileAppenderRegistration =
RollingFileAppender::registerClass();
} }
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/odbcappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp
index f1e1f35..b8f7b5a 100644
--- a/src/main/cpp/odbcappender.cpp
+++ b/src/main/cpp/odbcappender.cpp
@@ -39,18 +39,18 @@ using namespace log4cxx::helpers;
using namespace log4cxx::db;
using namespace log4cxx::spi;
-SQLException::SQLException(short fHandleType,
+SQLException::SQLException(short fHandleType,
void* hInput, const char* prolog,
- log4cxx::helpers::Pool& p)
+ log4cxx::helpers::Pool& p)
: Exception(formatMessage(fHandleType, hInput, prolog, p)) {
}
-SQLException::SQLException(const char* msg)
+SQLException::SQLException(const char* msg)
: Exception(msg) {
}
-SQLException::SQLException(const SQLException& src)
+SQLException::SQLException(const SQLException& src)
: Exception(src) {
}
@@ -69,7 +69,7 @@ const char* SQLException::formatMessage(short fHandleType,
// Get the status records.
i = 1;
while ((rc2 = SQLGetDiagRecA(fHandleType, hInput, i, SqlState, &NativeError,
- Msg, sizeof(Msg), &MsgLen)) != SQL_NO_DATA)
+ Msg, sizeof(Msg), &MsgLen)) != SQL_NO_DATA)
{
strReturn.append((char*) Msg);
i++;
@@ -140,7 +140,7 @@ void ODBCAppender::append(const spi::LoggingEventPtr& event, log4cxx::helpers::P
if (buffer.size() >= bufferSize)
flushBuffer(p);
-#endif
+#endif
}
LogString ODBCAppender::getLogStatement(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p) const
@@ -167,7 +167,7 @@ void ODBCAppender::execute(const LogString& sql, log4cxx::helpers::Pool& p)
throw SQLException( SQL_HANDLE_DBC, con, "Failed to allocate sql handle.", p);
}
- SQLWCHAR* wsql = Transcoder::wencode(sql, p);
+ SQLWCHAR* wsql = Transcoder::wencode(sql, p);
ret = SQLExecDirectW(stmt, wsql, SQL_NTS);
if (ret < 0)
@@ -181,7 +181,7 @@ void ODBCAppender::execute(const LogString& sql, log4cxx::helpers::Pool& p)
{
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
}
-
+
throw e;
}
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
@@ -242,8 +242,8 @@ ODBCAppender::SQLHDBC ODBCAppender::getConnection(log4cxx::helpers::Pool& p)
wchar_t szOutConnectionString[1024];
SQLSMALLINT nOutConnctionLength = 0;
- ret = SQLDriverConnectW( connection, NULL,
- wURL, SQL_NTS,
+ ret = SQLDriverConnectW( connection, NULL,
+ wURL, SQL_NTS,
szOutConnectionString, sizeof( szOutConnectionString ),
&nOutConnctionLength, SQL_DRIVER_NOPROMPT );
@@ -260,7 +260,7 @@ ODBCAppender::SQLHDBC ODBCAppender::getConnection(log4cxx::helpers::Pool& p)
return connection;
#else
return 0;
-#endif
+#endif
}
void ODBCAppender::close()
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/optionconverter.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/optionconverter.cpp b/src/main/cpp/optionconverter.cpp
index 030e2e7..862b547 100644
--- a/src/main/cpp/optionconverter.cpp
+++ b/src/main/cpp/optionconverter.cpp
@@ -350,10 +350,10 @@ void OptionConverter::selectAndConfigure(const File& configFileName,
LogString clazz = _clazz;
LogString filename(configFileName.getPath());
- if(clazz.empty()
+ if(clazz.empty()
&& filename.length() > 4
&& StringHelper::equalsIgnoreCase(
- filename.substr(filename.length() -4),
+ filename.substr(filename.length() -4),
LOG4CXX_STR(".XML"), LOG4CXX_STR(".xml")))
{
clazz = log4cxx::xml::DOMConfigurator::getStaticClass().toString();
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/rootlogger.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/rootlogger.cpp b/src/main/cpp/rootlogger.cpp
index ceb3e5e..e08f41b 100644
--- a/src/main/cpp/rootlogger.cpp
+++ b/src/main/cpp/rootlogger.cpp
@@ -24,7 +24,7 @@ using namespace log4cxx;
using namespace log4cxx::spi;
using namespace log4cxx::helpers;
-RootLogger::RootLogger(Pool& pool, const LevelPtr& level1) :
+RootLogger::RootLogger(Pool& pool, const LevelPtr& level1) :
Logger(pool, LOG4CXX_STR("root"))
{
setLevel(level1);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/serversocket.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/serversocket.cpp b/src/main/cpp/serversocket.cpp
index 32e4f1a..0669a43 100644
--- a/src/main/cpp/serversocket.cpp
+++ b/src/main/cpp/serversocket.cpp
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <log4cxx/helpers/serversocket.h>
#include <log4cxx/helpers/synchronized.h>
#include "apr_network_io.h"
@@ -28,17 +28,17 @@ using namespace log4cxx::helpers;
ServerSocket::ServerSocket(int port) : pool(), mutex(pool), socket(0), timeout(0)
{
apr_status_t status =
- apr_socket_create(&socket, APR_INET, SOCK_STREAM,
+ apr_socket_create(&socket, APR_INET, SOCK_STREAM,
APR_PROTO_TCP, pool.getAPRPool());
if (status != APR_SUCCESS) {
throw SocketException(status);
}
-
+
status = apr_socket_opt_set(socket, APR_SO_NONBLOCK, 1);
if (status != APR_SUCCESS) {
throw SocketException(status);
}
-
+
// Create server socket address (including port number)
apr_sockaddr_t *server_addr;
status =
@@ -53,8 +53,8 @@ ServerSocket::ServerSocket(int port) : pool(), mutex(pool), socket(0), timeout(0
if (status != APR_SUCCESS) {
throw BindException(status);
}
-
-
+
+
status = apr_socket_listen(socket, 50);
if (status != APR_SUCCESS) {
throw SocketException(status);
@@ -85,7 +85,7 @@ SocketPtr ServerSocket::accept() {
if (socket == 0) {
throw IOException();
}
-
+
apr_pollfd_t poll;
poll.p = pool.getAPRPool();
poll.desc_type = APR_POLL_SOCKET;
@@ -93,17 +93,17 @@ SocketPtr ServerSocket::accept() {
poll.rtnevents = 0;
poll.desc.s = socket;
poll.client_data = NULL;
-
+
apr_int32_t signaled;
apr_interval_time_t to = timeout * 1000;
- apr_status_t status = apr_poll(&poll, 1, &signaled, to);
-
+ apr_status_t status = apr_poll(&poll, 1, &signaled, to);
+
if (APR_STATUS_IS_TIMEUP(status)) {
throw SocketTimeoutException();
} else if (status != APR_SUCCESS) {
throw SocketException(status);
}
-
+
apr_pool_t* newPool;
status = apr_pool_create(&newPool, 0);
if (status != APR_SUCCESS) {
@@ -115,13 +115,13 @@ SocketPtr ServerSocket::accept() {
apr_pool_destroy(newPool);
throw SocketException(status);
}
-
+
status = apr_socket_opt_set(newSocket, APR_SO_NONBLOCK, 0);
if (status != APR_SUCCESS) {
apr_pool_destroy(newPool);
throw SocketException(status);
}
-
+
return new Socket(newSocket, newPool);
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/simpledateformat.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/simpledateformat.cpp b/src/main/cpp/simpledateformat.cpp
index f18dfc7..cf440ea 100644
--- a/src/main/cpp/simpledateformat.cpp
+++ b/src/main/cpp/simpledateformat.cpp
@@ -89,9 +89,9 @@ namespace log4cxx
virtual void format(LogString& s,
const apr_time_exp_t& date,
log4cxx::helpers::Pool& p) const = 0;
-
+
protected:
-
+
static void incrementMonth(tm& time, apr_time_exp_t& aprtime) {
time.tm_mon++;
aprtime.tm_mon++;
@@ -106,12 +106,12 @@ namespace log4cxx
time.tm_hour += 12;
aprtime.tm_hour += 12;
}
-
- static void renderFacet(const std::locale* locale,
- incrementFunction inc,
- char spec,
- unsigned int wspec,
- const char* aprspec,
+
+ static void renderFacet(const std::locale* locale,
+ incrementFunction inc,
+ char spec,
+ unsigned int wspec,
+ const char* aprspec,
std::vector<LogString>& values) {
std::vector<LogString>::iterator valueIter = values.begin();
tm time;
@@ -131,7 +131,7 @@ namespace log4cxx
start = os.str().length();
(*inc)(time, aprtime);
}
- } else
+ } else
#endif
if (HAS_FACET(*locale, std::time_put<char>)) {
const std::time_put<char>& facet = USE_FACET(*locale, std::time_put<char> );
@@ -145,8 +145,8 @@ namespace log4cxx
}
}
}
-#endif
- const size_t BUFSIZE = 256;
+#endif
+ const size_t BUFSIZE = 256;
char buf[BUFSIZE];
memset(buf, 0, BUFSIZE);
apr_size_t retsize = 0;
@@ -160,7 +160,7 @@ namespace log4cxx
}
}
}
-
+
private:
/**
* Private copy constructor.
@@ -221,7 +221,7 @@ public:
void format( LogString& s, const apr_time_exp_t & tm, Pool & p ) const
{
size_t initialLength = s.length();
-
+
StringHelper::toString( getField( tm ), p, s );
size_t finalLength = s.length();
if ( initialLength + width > finalLength )
@@ -601,7 +601,7 @@ void SimpleDateFormat::addToken(const logchar spec, const int repeat, const std:
PatternToken * token = NULL;
switch ( spec )
{
- case 0x47: // 'G'
+ case 0x47: // 'G'
token = ( new EraToken( repeat, locale ) );
break;
@@ -675,11 +675,11 @@ void SimpleDateFormat::addToken(const logchar spec, const int repeat, const std:
token = ( new HourToken( repeat, 1 ) );
break;
- case 0x6D: // 'm'
+ case 0x6D: // 'm'
token = ( new MinuteToken( repeat ) );
break;
- case 0x73: // 's'
+ case 0x73: // 's'
token = ( new SecondToken( repeat ) );
break;
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/smtpappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/smtpappender.cpp b/src/main/cpp/smtpappender.cpp
index 6fe8003..968aab4 100644
--- a/src/main/cpp/smtpappender.cpp
+++ b/src/main/cpp/smtpappender.cpp
@@ -49,9 +49,9 @@ namespace log4cxx {
// The following two classes implement an C++ SMTP wrapper over libesmtp.
// The same signatures could be implemented over different SMTP implementations
// or libesmtp could be combined with libgmime to enable support for non-ASCII
- // content.
+ // content.
-#if LOG4CXX_HAVE_LIBESMTP
+#if LOG4CXX_HAVE_LIBESMTP
/**
* SMTP Session.
*/
@@ -64,8 +64,8 @@ namespace log4cxx {
int smtpPort,
const LogString& smtpUsername,
const LogString& smtpPassword,
- Pool& p) : session(0), authctx(0),
- user(toAscii(smtpUsername, p)),
+ Pool& p) : session(0), authctx(0),
+ user(toAscii(smtpUsername, p)),
pwd(toAscii(smtpPassword, p)) {
auth_client_init();
session = smtp_create_session();
@@ -76,21 +76,21 @@ namespace log4cxx {
host.append(1, ':');
host.append(p.itoa(smtpPort));
smtp_set_server(session, host.c_str());
-
+
authctx = auth_create_context();
auth_set_mechanism_flags(authctx, AUTH_PLUGIN_PLAIN, 0);
auth_set_interact_cb(authctx, authinteract, (void*) this);
-
+
if (*user || *pwd) {
smtp_auth_set_context(session, authctx);
}
}
-
+
~SMTPSession() {
smtp_destroy_session(session);
auth_destroy_context(authctx);
}
-
+
void send(Pool& p) {
int status = smtp_start_session(session);
if (!status) {
@@ -100,7 +100,7 @@ namespace log4cxx {
throw Exception(buf);
}
}
-
+
operator smtp_session_t() {
return session;
}
@@ -120,7 +120,7 @@ namespace log4cxx {
*current = 0;
return buf;
}
-
+
private:
SMTPSession(SMTPSession&);
SMTPSession& operator=(SMTPSession&);
@@ -145,17 +145,17 @@ namespace log4cxx {
}
return 1;
}
-
+
};
-
+
/**
* A message in an SMTP session.
*/
class SMTPMessage {
public:
- SMTPMessage(SMTPSession& session,
- const LogString& from,
+ SMTPMessage(SMTPSession& session,
+ const LogString& from,
const LogString& to,
const LogString& cc,
const LogString& bcc,
@@ -170,11 +170,11 @@ namespace log4cxx {
if (!subject.empty()) {
smtp_set_header(message, "Subject", toAscii(subject, p));
}
- smtp_set_messagecb(message, messagecb, this);
+ smtp_set_messagecb(message, messagecb, this);
}
~SMTPMessage() {
}
-
+
private:
SMTPMessage(const SMTPMessage&);
SMTPMessage& operator=(const SMTPMessage&);
@@ -196,9 +196,9 @@ namespace log4cxx {
static const char* toAscii(const LogString& str, Pool& p) {
return SMTPSession::toAscii(str, p);
}
-
+
/**
- * Message bodies can only contain US-ASCII characters and
+ * Message bodies can only contain US-ASCII characters and
* CR and LFs can only occur together.
*/
static const char* toMessage(const LogString& str, Pool& p) {
@@ -251,7 +251,7 @@ namespace log4cxx {
*current = 0;
return retval;
}
-
+
/**
* Callback for message.
*/
@@ -271,10 +271,10 @@ namespace log4cxx {
}
return retval;
}
-
+
};
-#endif
-
+#endif
+
class LOG4CXX_EXPORT DefaultEvaluator :
public virtual spi::TriggeringEventEvaluator,
public virtual helpers::ObjectImpl
@@ -299,7 +299,7 @@ namespace log4cxx {
DefaultEvaluator(const DefaultEvaluator&);
DefaultEvaluator& operator=(const DefaultEvaluator&);
}; // class DefaultEvaluator
-
+
}
}
@@ -334,8 +334,8 @@ SMTPAppender::~SMTPAppender()
finalize();
}
-bool SMTPAppender::requiresLayout() const {
- return true;
+bool SMTPAppender::requiresLayout() const {
+ return true;
}
@@ -376,8 +376,8 @@ bool SMTPAppender::getLocationInfo() const {
return locationInfo;
}
-void SMTPAppender::setLocationInfo(bool newVal) {
- locationInfo = newVal;
+void SMTPAppender::setLocationInfo(bool newVal) {
+ locationInfo = newVal;
}
LogString SMTPAppender::getSMTPUsername() const {
@@ -461,7 +461,7 @@ bool SMTPAppender::asciiCheck(const LogString& value, const LogString& field) {
if (0x7F < (unsigned int) *iter) {
LogLog::warn(field + LOG4CXX_STR(" contains non-ASCII character"));
return false;
- }
+ }
}
return true;
}
@@ -495,11 +495,11 @@ void SMTPAppender::activateOptions(Pool& p)
activate &= asciiCheck(cc, LOG4CXX_STR("cc"));
activate &= asciiCheck(bcc, LOG4CXX_STR("bcc"));
activate &= asciiCheck(from, LOG4CXX_STR("from"));
-
+
#if !LOG4CXX_HAS_LIBESMTP
LogLog::error(LOG4CXX_STR("log4cxx built without SMTP support."));
activate = false;
-#endif
+#endif
if (activate) {
AppenderSkeleton::activateOptions(p);
}
@@ -560,7 +560,7 @@ bool SMTPAppender::checkEntryConditions()
return true;
#else
return false;
-#endif
+#endif
}
@@ -616,10 +616,10 @@ void SMTPAppender::sendBuffer(Pool& p)
layout->appendFooter(sbuf, p);
SMTPSession session(smtpHost, smtpPort, smtpUsername, smtpPassword, p);
-
- SMTPMessage message(session, from, to, cc,
+
+ SMTPMessage message(session, from, to, cc,
bcc, subject, sbuf, p);
-
+
session.send(p);
}
@@ -627,7 +627,7 @@ void SMTPAppender::sendBuffer(Pool& p)
{
LogLog::error(LOG4CXX_STR("Error occured while sending e-mail notification."), e);
}
-#endif
+#endif
}
/**
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/socket.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/socket.cpp b/src/main/cpp/socket.cpp
index ae83a3e..85e61e2 100644
--- a/src/main/cpp/socket.cpp
+++ b/src/main/cpp/socket.cpp
@@ -29,15 +29,15 @@ IMPLEMENT_LOG4CXX_OBJECT(Socket)
/** 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& address, int port) : pool(), socket(0), address(address), port(port)
{
apr_status_t status =
- apr_socket_create(&socket, APR_INET, SOCK_STREAM,
+ apr_socket_create(&socket, APR_INET, SOCK_STREAM,
APR_PROTO_TCP, pool.getAPRPool());
if (status != APR_SUCCESS) {
throw SocketException(status);
}
-
+
LOG4CXX_ENCODE_CHAR(host, address->getHostAddress());
// create socket address (including port)
@@ -98,7 +98,7 @@ size_t Socket::write(ByteBuffer& buf) {
#else
apr_status_t status = apr_socket_send(socket, buf.current(), &written);
#endif
-
+
buf.position(buf.position() + written);
totalWritten += written;
if (status != APR_SUCCESS) {
@@ -114,7 +114,7 @@ void Socket::close() {
apr_status_t status = apr_socket_close(socket);
if (status != APR_SUCCESS) {
throw SocketException(status);
- }
+ }
socket = 0;
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/sockethubappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/sockethubappender.cpp b/src/main/cpp/sockethubappender.cpp
index 8b92d5e..d68a176 100644
--- a/src/main/cpp/sockethubappender.cpp
+++ b/src/main/cpp/sockethubappender.cpp
@@ -127,13 +127,13 @@ void SocketHubAppender::append(const spi::LoggingEventPtr& event, Pool& p)
{
return;
}
-
+
LogString ndcVal;
event->getNDC(ndcVal);
event->getThreadName();
// Get a copy of this thread's MDC.
event->getMDCCopy();
-
+
// loop through the current set of open connections, appending the event to each
std::vector<ObjectOutputStreamPtr>::iterator it = streams.begin();
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/syslogwriter.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/syslogwriter.cpp b/src/main/cpp/syslogwriter.cpp
index 5267907..7b80564 100644
--- a/src/main/cpp/syslogwriter.cpp
+++ b/src/main/cpp/syslogwriter.cpp
@@ -59,7 +59,7 @@ void SyslogWriter::write(const LogString& source) {
if (this->ds != 0 && this->address != 0) {
LOG4CXX_ENCODE_CHAR(data, source);
- DatagramPacketPtr packet(
+ DatagramPacketPtr packet(
new DatagramPacket((void*) data.data(), data.length(),
address, SYSLOG_PORT));
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/system.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/system.cpp b/src/main/cpp/system.cpp
index 2d3c11b..7047aa4 100644
--- a/src/main/cpp/system.cpp
+++ b/src/main/cpp/system.cpp
@@ -86,7 +86,7 @@ LogString System::getProperty(const LogString& lkey)
LOG4CXX_ENCODE_CHAR(key, lkey);
Pool p;
char* value = NULL;
- apr_status_t stat = apr_env_get(&value, key.c_str(),
+ apr_status_t stat = apr_env_get(&value, key.c_str(),
p.getAPRPool());
if (stat == APR_SUCCESS) {
Transcoder::decode((const char*) value, rv);