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 11:48:12 UTC
[3/3] 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/fb126e74
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/fb126e74
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/fb126e74
Branch: refs/heads/master
Commit: fb126e744f87251ee16fa2bef0053726f5a183ce
Parents: 5f82518
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Aug 19 13:48:05 2018 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Aug 19 13:48:05 2018 +0200
----------------------------------------------------------------------
src/main/cpp/appenderskeleton.cpp | 2 +-
src/main/cpp/asyncappender.cpp | 24 +--
src/main/cpp/class.cpp | 2 +-
src/main/cpp/defaultrepositoryselector.cpp | 8 +-
src/main/cpp/domconfigurator.cpp | 44 +++---
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/inetaddress.cpp | 6 +-
src/main/cpp/layout.cpp | 4 +-
src/main/cpp/logger.cpp | 90 +++++------
src/main/cpp/logstream.cpp | 74 ++++-----
src/main/cpp/messagebuffer.cpp | 8 +-
src/main/cpp/obsoleterollingfileappender.cpp | 8 +-
src/main/cpp/optionconverter.cpp | 4 +-
src/main/cpp/properties.cpp | 4 +-
src/main/cpp/propertyconfigurator.cpp | 4 +-
src/main/cpp/rootlogger.cpp | 2 +-
src/main/cpp/serversocket.cpp | 26 +--
src/main/cpp/smtpappender.cpp | 70 ++++----
src/main/cpp/socket.cpp | 10 +-
src/main/cpp/syslogwriter.cpp | 2 +-
src/main/cpp/system.cpp | 2 +-
src/main/cpp/telnetappender.cpp | 12 +-
src/main/cpp/threadcxx.cpp | 24 +--
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/writer.cpp | 2 +-
src/main/cpp/writerappender.cpp | 6 +-
src/main/cpp/xmllayout.cpp | 8 +-
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 | 8 +-
src/main/include/log4cxx/defaultloggerfactory.h | 2 +-
src/main/include/log4cxx/file.h | 6 +-
src/main/include/log4cxx/filter/andfilter.h | 4 +-
.../include/log4cxx/filter/expressionfilter.h | 2 +-
.../include/log4cxx/filter/locationinfofilter.h | 2 +-
.../include/log4cxx/filter/propertyfilter.h | 2 +-
.../log4cxx/helpers/appenderattachableimpl.h | 4 +-
.../include/log4cxx/helpers/aprinitializer.h | 8 +-
.../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 ++---
.../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 | 10 +-
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/logmanager.h | 4 +-
src/main/include/log4cxx/logstring.h | 4 +-
src/main/include/log4cxx/ndc.h | 24 +--
src/main/include/log4cxx/net/smtpappender.h | 12 +-
.../log4cxx/net/socketappenderskeleton.h | 8 +-
src/main/include/log4cxx/net/telnetappender.h | 6 +-
.../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/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/manualtriggeringpolicy.h | 2 +-
.../log4cxx/rolling/rollingfileappender.h | 8 +-
.../rolling/rollingfileappenderskeleton.h | 8 +-
.../include/log4cxx/rolling/rollingpolicybase.h | 6 +-
.../log4cxx/rolling/sizebasedtriggeringpolicy.h | 2 +-
.../include/log4cxx/rolling/triggeringpolicy.h | 4 +-
.../include/log4cxx/rolling/zipcompressaction.h | 2 +-
.../include/log4cxx/spi/appenderattachable.h | 2 +-
src/main/include/log4cxx/spi/errorhandler.h | 2 +-
src/main/include/log4cxx/spi/filter.h | 2 +-
.../log4cxx/spi/hierarchyeventlistener.h | 4 +-
src/main/include/log4cxx/spi/loggerfactory.h | 2 +-
src/main/include/log4cxx/spi/loggerrepository.h | 2 +-
src/main/include/log4cxx/stream.h | 158 +++++++++----------
.../log4cxx/varia/fallbackerrorhandler.h | 2 +-
src/main/include/log4cxx/writerappender.h | 2 +-
src/main/include/log4cxx/xml/domconfigurator.h | 8 +-
src/main/include/log4cxx/xml/xmllayout.h | 8 +-
118 files changed, 563 insertions(+), 563 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/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/fb126e74/src/main/cpp/asyncappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/asyncappender.cpp b/src/main/cpp/asyncappender.cpp
index c6f8a67..52fc194 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
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
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
}
return 0;
}
-#endif
+#endif
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/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/fb126e74/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/fb126e74/src/main/cpp/domconfigurator.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/domconfigurator.cpp b/src/main/cpp/domconfigurator.cpp
index 50b5018..95a7b60 100644
--- a/src/main/cpp/domconfigurator.cpp
+++ b/src/main/cpp/domconfigurator.cpp
@@ -288,7 +288,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)
@@ -298,7 +298,7 @@ void DOMConfigurator::parseErrorHandler(Pool& p,
subst(getAttribute(utf8Decoder, element, CLASS_ATTR)),
ErrorHandler::getStaticClass(),
0);
-
+
if(eh != 0)
{
eh->setAppender(appender);
@@ -340,9 +340,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));
@@ -373,8 +373,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)
{
@@ -403,7 +403,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)));
@@ -438,9 +438,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();
@@ -454,9 +454,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)
{
@@ -511,7 +511,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)));
@@ -548,7 +548,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));
@@ -596,7 +596,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));
@@ -635,7 +635,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();
@@ -703,7 +703,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)));
@@ -832,7 +832,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
@@ -851,7 +851,7 @@ void DOMConfigurator::configureAndWatch(const std::wstring& filename, long delay
xdog->start();
#else
DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
-#endif
+#endif
}
#endif
@@ -871,7 +871,7 @@ void DOMConfigurator::configureAndWatch(const std::basic_string<UniChar>& filena
xdog->start();
#else
DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
-#endif
+#endif
}
#endif
@@ -891,7 +891,7 @@ void DOMConfigurator::configureAndWatch(const CFStringRef& filename, long delay)
xdog->start();
#else
DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
-#endif
+#endif
}
#endif
@@ -995,7 +995,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/fb126e74/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/fb126e74/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/fb126e74/src/main/cpp/fileappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/fileappender.cpp b/src/main/cpp/fileappender.cpp
index 0feb4c6..46ff632 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;
}
}
-
-
+
+
//
// if a new file and UTF-16, then write a BOM
//
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/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/fb126e74/src/main/cpp/gzcompressaction.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/gzcompressaction.cpp b/src/main/cpp/gzcompressaction.cpp
index 8c4b29f..b6d0739 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, aprpool);
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(aprpool, 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, aprpool);
@@ -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/fb126e74/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/fb126e74/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/fb126e74/src/main/cpp/logger.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/logger.cpp b/src/main/cpp/logger.cpp
index 9f93c3f..dd9a343 100644
--- a/src/main/cpp/logger.cpp
+++ b/src/main/cpp/logger.cpp
@@ -84,8 +84,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,...
@@ -213,7 +213,7 @@ ResourceBundlePtr Logger::getResourceBundle() const
}
-LogString Logger::getResourceBundleString(const LogString& key) const
+LogString Logger::getResourceBundleString(const LogString& key) const
{
ResourceBundlePtr rb = getResourceBundle();
@@ -406,7 +406,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);
@@ -419,7 +419,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);
@@ -516,18 +516,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()) {
@@ -651,18 +651,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()) {
@@ -770,18 +770,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()) {
@@ -887,18 +887,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/fb126e74/src/main/cpp/logstream.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/logstream.cpp b/src/main/cpp/logstream.cpp
index 03da0ef..74396ed 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& log,
}
}
}
-
+
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& log,
}
}
}
-
+
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/fb126e74/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/fb126e74/src/main/cpp/obsoleterollingfileappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/obsoleterollingfileappender.cpp b/src/main/cpp/obsoleterollingfileappender.cpp
index 3770233..5c6f5d6 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/fb126e74/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/fb126e74/src/main/cpp/properties.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/properties.cpp b/src/main/cpp/properties.cpp
index 7841437..177699c 100644
--- a/src/main/cpp/properties.cpp
+++ b/src/main/cpp/properties.cpp
@@ -120,7 +120,7 @@ public:
key.append(1, 0x0D);
lexemType = KEY;
break;
-
+
case 0x0A: // '\n'
lexemType = KEY_CONTINUE;
break;
@@ -128,7 +128,7 @@ public:
case 0x0D: // '\r'
lexemType = KEY_CONTINUE2;
break;
-
+
default:
key.append(1, c);
lexemType = KEY;
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/cpp/propertyconfigurator.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/propertyconfigurator.cpp b/src/main/cpp/propertyconfigurator.cpp
index 6d98d07..82d9b05 100644
--- a/src/main/cpp/propertyconfigurator.cpp
+++ b/src/main/cpp/propertyconfigurator.cpp
@@ -51,7 +51,7 @@ using namespace log4cxx::config;
#if APR_HAS_THREADS
#include <log4cxx/helpers/filewatchdog.h>
-namespace log4cxx
+namespace log4cxx
{
class PropertyWatchdog : public FileWatchdog
{
@@ -142,7 +142,7 @@ void PropertyConfigurator::configureAndWatch(
{
if(pdog)
{
- APRInitializer::unregisterCleanup(pdog);
+ APRInitializer::unregisterCleanup(pdog);
delete pdog;
}
pdog = new PropertyWatchdog(configFilename);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/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/fb126e74/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/fb126e74/src/main/cpp/smtpappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/smtpappender.cpp b/src/main/cpp/smtpappender.cpp
index 001e31c..3439588 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,
@@ -171,11 +171,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&);
@@ -198,9 +198,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) {
@@ -253,7 +253,7 @@ namespace log4cxx {
*current = 0;
return retval;
}
-
+
/**
* Callback for message.
*/
@@ -277,10 +277,10 @@ namespace log4cxx {
}
return retval;
}
-
+
};
-#endif
-
+#endif
+
class LOG4CXX_EXPORT DefaultEvaluator :
public virtual spi::TriggeringEventEvaluator,
public virtual helpers::ObjectImpl
@@ -305,7 +305,7 @@ namespace log4cxx {
DefaultEvaluator(const DefaultEvaluator&);
DefaultEvaluator& operator=(const DefaultEvaluator&);
}; // class DefaultEvaluator
-
+
}
}
@@ -340,8 +340,8 @@ SMTPAppender::~SMTPAppender()
finalize();
}
-bool SMTPAppender::requiresLayout() const {
- return true;
+bool SMTPAppender::requiresLayout() const {
+ return true;
}
@@ -382,8 +382,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 {
@@ -467,7 +467,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;
}
@@ -501,11 +501,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_HAVE_LIBESMTP
errorHandler->error(LOG4CXX_STR("log4cxx built without SMTP support."));
activate = false;
-#endif
+#endif
if (activate) {
AppenderSkeleton::activateOptions(p);
}
@@ -566,7 +566,7 @@ bool SMTPAppender::checkEntryConditions()
return true;
#else
return false;
-#endif
+#endif
}
@@ -622,10 +622,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);
}
@@ -633,7 +633,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/fb126e74/src/main/cpp/socket.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/socket.cpp b/src/main/cpp/socket.cpp
index 870e0a4..0d876ed 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& addr, int prt) : pool(), socket(0), address(addr), port(prt)
+Socket::Socket(InetAddressPtr& addr, int prt) : pool(), socket(0), address(addr), port(prt)
{
apr_status_t status =
- apr_socket_create(&socket, APR_INET, SOCK_STREAM,
+ apr_socket_create(&socket, APR_INET, SOCK_STREAM,
APR_PROTO_TCP, pool.getAPRPool());
if (status != APR_SUCCESS) {
throw SocketException(status);
}
-
+
LOG4CXX_ENCODE_CHAR(host, addr->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/fb126e74/src/main/cpp/syslogwriter.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/syslogwriter.cpp b/src/main/cpp/syslogwriter.cpp
index 20b1c00..676a924 100644
--- a/src/main/cpp/syslogwriter.cpp
+++ b/src/main/cpp/syslogwriter.cpp
@@ -57,7 +57,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, syslogHostPort));
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/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);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/cpp/telnetappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/telnetappender.cpp b/src/main/cpp/telnetappender.cpp
index a12950b..6914178 100644
--- a/src/main/cpp/telnetappender.cpp
+++ b/src/main/cpp/telnetappender.cpp
@@ -42,8 +42,8 @@ const int TelnetAppender::MAX_CONNECTIONS = 20;
TelnetAppender::TelnetAppender()
: port(DEFAULT_PORT), connections(MAX_CONNECTIONS),
- encoding(LOG4CXX_STR("UTF-8")),
- encoder(CharsetEncoder::getUTF8Encoder()),
+ encoding(LOG4CXX_STR("UTF-8")),
+ encoder(CharsetEncoder::getUTF8Encoder()),
serverSocket(NULL), sh()
{
synchronized sync(mutex);
@@ -60,7 +60,7 @@ void TelnetAppender::activateOptions(Pool& /* p */)
{
if (serverSocket == NULL) {
serverSocket = new ServerSocket(port);
- serverSocket->setSoTimeout(1000);
+ serverSocket->setSoTimeout(1000);
}
sh.run(acceptConnections, this);
}
@@ -116,7 +116,7 @@ void TelnetAppender::close()
} catch(Exception&) {
}
}
-
+
try {
sh.join();
} catch(Exception& ex) {
@@ -146,7 +146,7 @@ void TelnetAppender::write(ByteBuffer& buf) {
void TelnetAppender::writeStatus(const SocketPtr& socket, const LogString& msg, Pool& p) {
size_t bytesSize = msg.size() * 2;
char* bytes = p.pstralloc(bytesSize);
-
+
LogString::const_iterator msgIter(msg.begin());
ByteBuffer buf(bytes, bytesSize);
@@ -167,7 +167,7 @@ void TelnetAppender::append(const spi::LoggingEventPtr& event, Pool& p)
msg.append(LOG4CXX_STR("\r\n"));
size_t bytesSize = msg.size() * 2;
char* bytes = p.pstralloc(bytesSize);
-
+
LogString::const_iterator msgIter(msg.begin());
ByteBuffer buf(bytes, bytesSize);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/cpp/threadcxx.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/threadcxx.cpp b/src/main/cpp/threadcxx.cpp
index 4a91d27..05450fd 100644
--- a/src/main/cpp/threadcxx.cpp
+++ b/src/main/cpp/threadcxx.cpp
@@ -82,13 +82,13 @@ namespace {
LaunchPackage(const LaunchPackage&);
LaunchPackage& operator=(const LaunchPackage&);
Thread* thread;
- Runnable runnable;
+ Runnable runnable;
void* data;
};
-
+
/**
* This object atomically sets the specified memory location
- * to non-zero on construction and to zero on destruction.
+ * to non-zero on construction and to zero on destruction.
* Used to maintain Thread.alive.
*/
class LaunchStatus {
@@ -116,7 +116,7 @@ namespace {
/**
* Get a key to the thread local storage used to hold the reference to
* the corresponding Thread object.
- */
+ */
ThreadLocal& getThreadLocal() {
static ThreadLocal tls;
return tls;
@@ -137,7 +137,7 @@ void* LOG4CXX_THREAD_FUNC ThreadLaunch::launcher(apr_thread_t* thread, void* dat
}
#endif
-Thread::Thread() : thread(NULL), alive(0), interruptedStatus(0),
+Thread::Thread() : thread(NULL), alive(0), interruptedStatus(0),
interruptedMutex(NULL), interruptedCondition(NULL) {
}
@@ -166,17 +166,17 @@ void Thread::run(Runnable start, void* data) {
if (stat != APR_SUCCESS) {
throw ThreadException(stat);
}
-
+
stat = apr_thread_cond_create(&interruptedCondition, p.getAPRPool());
if (stat != APR_SUCCESS) {
throw ThreadException(stat);
}
- stat = apr_thread_mutex_create(&interruptedMutex, APR_THREAD_MUTEX_NESTED,
+ stat = apr_thread_mutex_create(&interruptedMutex, APR_THREAD_MUTEX_NESTED,
p.getAPRPool());
if (stat != APR_SUCCESS) {
throw ThreadException(stat);
}
-
+
// create LaunchPackage on the thread's memory pool
LaunchPackage* package = new(p) LaunchPackage(this, start, data);
stat = apr_thread_create(&thread, attrs,
@@ -222,7 +222,7 @@ void Thread::interrupt() {
apr_status_t stat = apr_thread_cond_signal(interruptedCondition);
if (stat != APR_SUCCESS) throw ThreadException(stat);
}
-#endif
+#endif
}
bool Thread::interrupted() {
@@ -264,7 +264,7 @@ void Thread::sleep(int duration) {
apr_sleep(duration*1000);
} else {
synchronized sync(pThis->interruptedMutex);
- apr_status_t stat = apr_thread_cond_timedwait(pThis->interruptedCondition,
+ apr_status_t stat = apr_thread_cond_timedwait(pThis->interruptedCondition,
pThis->interruptedMutex, duration*1000);
if (stat != APR_SUCCESS && !APR_STATUS_IS_TIMEUP(stat)) {
throw ThreadException(stat);
@@ -274,9 +274,9 @@ void Thread::sleep(int duration) {
}
}
}
-#else
+#else
if (duration > 0) {
apr_sleep(duration*1000);
}
-#endif
+#endif
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/cpp/threadlocal.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/threadlocal.cpp b/src/main/cpp/threadlocal.cpp
index ff408ec..313ecfc 100644
--- a/src/main/cpp/threadlocal.cpp
+++ b/src/main/cpp/threadlocal.cpp
@@ -35,10 +35,10 @@ apr_threadkey_t* ThreadLocal::create(Pool& p) {
ThreadLocal::ThreadLocal() : p(), key(create(p)) {
}
-
+
ThreadLocal::~ThreadLocal() {
}
-
+
void ThreadLocal::set(void* priv) {
#if APR_HAS_THREADS
apr_status_t stat = apr_threadkey_private_set(priv, key);
@@ -47,7 +47,7 @@ void ThreadLocal::set(void* priv) {
}
#endif
}
-
+
void* ThreadLocal::get() {
void* retval = 0;
#if APR_HAS_THREADS
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/cpp/threadspecificdata.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/threadspecificdata.cpp b/src/main/cpp/threadspecificdata.cpp
index 994d821..0968526 100644
--- a/src/main/cpp/threadspecificdata.cpp
+++ b/src/main/cpp/threadspecificdata.cpp
@@ -55,7 +55,7 @@ ThreadSpecificData* ThreadSpecificData::getCurrentData() {
apr_threadkey_private_get(&pData, APRInitializer::getTlsKey());
return (ThreadSpecificData*) pData;
#else
- return &getDataNoThreads();
+ return &getDataNoThreads();
#endif
}
@@ -71,7 +71,7 @@ void ThreadSpecificData::recycle() {
}
}
}
-#endif
+#endif
}
void ThreadSpecificData::put(const LogString& key, const LogString& val) {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/cpp/transcoder.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/transcoder.cpp b/src/main/cpp/transcoder.cpp
index 32bed84..c3e6f62 100644
--- a/src/main/cpp/transcoder.cpp
+++ b/src/main/cpp/transcoder.cpp
@@ -66,7 +66,7 @@ void Transcoder::encodeUTF8(const LogString& src, std::string& dst) {
iter++;
}
}
-#endif
+#endif
}
char* Transcoder::encodeUTF8(const LogString& src, Pool& p) {
@@ -76,7 +76,7 @@ char* Transcoder::encodeUTF8(const LogString& src, Pool& p) {
std::string tmp;
encodeUTF8(src, tmp);
return p.pstrdup(tmp);
-#endif
+#endif
}
@@ -254,7 +254,7 @@ void Transcoder::decode(const std::string& src, LogString& dst) {
dst.append(1, *iter);
}
#endif
- if (iter != src.end()) {
+ if (iter != src.end()) {
size_t offset = iter - src.begin();
ByteBuffer buf(const_cast<char*>(src.data() + offset), src.size() - offset);
while(buf.remaining() > 0) {
@@ -266,7 +266,7 @@ void Transcoder::decode(const std::string& src, LogString& dst) {
}
decoder->decode(buf, dst);
}
-#endif
+#endif
}
char* Transcoder::encode(const LogString& src, Pool& p) {
@@ -310,7 +310,7 @@ void Transcoder::encode(const LogString& src, std::string& dst) {
}
encoder->encode(src, iter, out);
}
-#endif
+#endif
}
@@ -379,7 +379,7 @@ void Transcoder::decode(const std::wstring& src, LogString& dst) {
i++;
}
}
-#endif
+#endif
}
void Transcoder::encode(const LogString& src, std::wstring& dst) {
@@ -405,7 +405,7 @@ wchar_t* Transcoder::wencode(const LogString& src, Pool& p) {
dst[tmp.length()] = 0;
memcpy(dst, tmp.data(), tmp.length() * sizeof(wchar_t));
return dst;
-}
+}
unsigned int Transcoder::decode(const std::wstring& in,
@@ -444,7 +444,7 @@ void Transcoder::decode(const std::basic_string<UniChar>& src, LogString& dst) {
unsigned int cp = decode(src, i);
encode(cp, dst);
}
-#endif
+#endif
}
void Transcoder::encode(const LogString& src, std::basic_string<UniChar>& dst) {
@@ -484,7 +484,7 @@ void Transcoder::decode(const CFStringRef& src, LogString& dst) {
dst.append(&tmp[0], tmp.size());
#else
decode(std::basic_string<UniChar>(&tmp[0], tmp.size()), dst);
-#endif
+#endif
}
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/cpp/transform.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/transform.cpp b/src/main/cpp/transform.cpp
index ac0217e..6528b3c 100644
--- a/src/main/cpp/transform.cpp
+++ b/src/main/cpp/transform.cpp
@@ -33,7 +33,7 @@ void Transform::appendEscapingTags(
{
return;
}
-
+
logchar specials[] = { 0x22 /* " */, 0x26 /* & */, 0x3C /* < */, 0x3E /* > */, 0x00 };
size_t start = 0;
size_t special = input.find_first_of(specials, start);
@@ -45,19 +45,19 @@ void Transform::appendEscapingTags(
case 0x22:
buf.append(LOG4CXX_STR("""));
break;
-
+
case 0x26:
buf.append(LOG4CXX_STR("&"));
break;
-
+
case 0x3C:
buf.append(LOG4CXX_STR("<"));
break;
-
+
case 0x3E:
buf.append(LOG4CXX_STR(">"));
break;
-
+
default:
buf.append(1, input[special]);
break;
@@ -69,7 +69,7 @@ void Transform::appendEscapingTags(
special = LogString::npos;
}
}
-
+
if (start < input.size()) {
buf.append(input, start, input.size() - start);
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/cpp/writer.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/writer.cpp b/src/main/cpp/writer.cpp
index 7074136..ee44fca 100644
--- a/src/main/cpp/writer.cpp
+++ b/src/main/cpp/writer.cpp
@@ -29,7 +29,7 @@ Writer::Writer() {
Writer::~Writer() {
}
-#ifdef LOG4CXX_MULTI_PROCESS
+#ifdef LOG4CXX_MULTI_PROCESS
OutputStreamPtr Writer::getOutPutStreamPtr(){
throw std::logic_error("getOutPutStreamPtr must be implemented in the derived class that you are using");
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/cpp/writerappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/writerappender.cpp b/src/main/cpp/writerappender.cpp
index 8282ed8..951a8a0 100644
--- a/src/main/cpp/writerappender.cpp
+++ b/src/main/cpp/writerappender.cpp
@@ -115,7 +115,7 @@ bool WriterAppender::checkEntryConditions() const {
return false;
}
-
+
if (layout == 0) {
errorHandler->error(
LogString(LOG4CXX_STR("No layout set for the appender named [")) +
@@ -265,7 +265,7 @@ void WriterAppender::setOption(const LogString& option, const LogString& value)
}
-void WriterAppender::setImmediateFlush(bool value) {
+void WriterAppender::setImmediateFlush(bool value) {
synchronized sync(mutex);
- immediateFlush = value;
+ immediateFlush = value;
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/cpp/xmllayout.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/xmllayout.cpp b/src/main/cpp/xmllayout.cpp
index c42def0..49be88f 100644
--- a/src/main/cpp/xmllayout.cpp
+++ b/src/main/cpp/xmllayout.cpp
@@ -99,7 +99,7 @@ void XMLLayout::format(LogString& output,
output.append(LOG4CXX_STR("\"/>"));
output.append(LOG4CXX_EOL);
}
-
+
if (properties) {
LoggingEvent::KeySet propertySet(event->getPropertyKeySet());
LoggingEvent::KeySet keySet(event->getMDCKeySet());
@@ -107,7 +107,7 @@ void XMLLayout::format(LogString& output,
output.append(LOG4CXX_STR("<log4j:properties>"));
output.append(LOG4CXX_EOL);
for (LoggingEvent::KeySet::const_iterator i = keySet.begin();
- i != keySet.end();
+ i != keySet.end();
i++) {
LogString key(*i);
LogString value;
@@ -121,7 +121,7 @@ void XMLLayout::format(LogString& output,
}
}
for (LoggingEvent::KeySet::const_iterator i2 = propertySet.begin();
- i2 != propertySet.end();
+ i2 != propertySet.end();
i2++) {
LogString key(*i2);
LogString value;
@@ -141,6 +141,6 @@ void XMLLayout::format(LogString& output,
output.append(LOG4CXX_STR("</log4j:event>"));
output.append(LOG4CXX_EOL);
- output.append(LOG4CXX_EOL);
+ output.append(LOG4CXX_EOL);
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/asyncappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/asyncappender.h b/src/main/include/log4cxx/asyncappender.h
index 86a7371..3c24ae2 100644
--- a/src/main/include/log4cxx/asyncappender.h
+++ b/src/main/include/log4cxx/asyncappender.h
@@ -67,7 +67,7 @@ namespace log4cxx
* Create new instance.
*/
AsyncAppender();
-
+
/**
* Destructor.
*/
@@ -97,7 +97,7 @@ namespace log4cxx
* @return list of all attached appenders.
*/
AppenderList getAllAppenders() const;
-
+
/**
* Get appender by name.
*
@@ -121,7 +121,7 @@ namespace log4cxx
bool isAttached(const AppenderPtr& appender) const;
virtual bool requiresLayout() const;
-
+
/**
* Removes and closes all attached appenders.
*/
@@ -136,7 +136,7 @@ namespace log4cxx
* Remove appender by name.
* @param name name.
*/
- void removeAppender(const LogString& name);
+ void removeAppender(const LogString& name);
/**
* The <b>LocationInfo</b> attribute is provided for compatibility
@@ -174,8 +174,8 @@ namespace log4cxx
* @return true if calling thread will be blocked when buffer is full.
*/
bool getBlocking() const;
-
-
+
+
/**
* Set appender properties by name.
* @param option property name.
@@ -203,19 +203,19 @@ namespace log4cxx
::log4cxx::helpers::Mutex bufferMutex;
::log4cxx::helpers::Condition bufferNotFull;
::log4cxx::helpers::Condition bufferNotEmpty;
-
+
class DiscardSummary {
private:
/**
* First event of the highest severity.
*/
::log4cxx::spi::LoggingEventPtr maxEvent;
-
+
/**
* Total count of messages discarded.
*/
int count;
-
+
public:
/**
* Create new instance.
@@ -227,14 +227,14 @@ namespace log4cxx
DiscardSummary(const DiscardSummary& src);
/** Assignment operator. */
DiscardSummary& operator=(const DiscardSummary& src);
-
+
/**
* Add discarded event to summary.
*
* @param event event, may not be null.
*/
void add(const ::log4cxx::spi::LoggingEventPtr& event);
-
+
/**
* Create event with summary information.
*
@@ -248,7 +248,7 @@ namespace log4cxx
*/
typedef std::map<LogString, DiscardSummary> DiscardMap;
DiscardMap* discardMap;
-
+
/**
* Buffer size.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/consoleappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/consoleappender.h b/src/main/include/log4cxx/consoleappender.h
index a97e8e3..94afe21 100644
--- a/src/main/include/log4cxx/consoleappender.h
+++ b/src/main/include/log4cxx/consoleappender.h
@@ -22,7 +22,7 @@
namespace log4cxx
{
-
+
/**
* ConsoleAppender appends log events to <code>stdout</code> or
* <code>stderr</code> using a layout specified by the user. The
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/dailyrollingfileappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/dailyrollingfileappender.h b/src/main/include/log4cxx/dailyrollingfileappender.h
index 628a997..3c8f064 100644
--- a/src/main/include/log4cxx/dailyrollingfileappender.h
+++ b/src/main/include/log4cxx/dailyrollingfileappender.h
@@ -45,7 +45,7 @@ namespace log4cxx {
underlying file is rolled over at a user chosen frequency.
<p>The rolling schedule is specified by the <b>DatePattern</b>
- option. This pattern should follow the
+ option. This pattern should follow the
{@link log4cxx::helpers::SimpleDateFormat SimpleDateFormat}
conventions. In particular, you <em>must</em> escape literal text
within a pair of single quotes. A formatted version of the date
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/db/odbcappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/db/odbcappender.h b/src/main/include/log4cxx/db/odbcappender.h
index 180653d..e1b8fd5 100644
--- a/src/main/include/log4cxx/db/odbcappender.h
+++ b/src/main/include/log4cxx/db/odbcappender.h
@@ -37,7 +37,7 @@ namespace log4cxx
{
class LOG4CXX_EXPORT SQLException : public log4cxx::helpers::Exception {
public:
- SQLException(short fHandleType,
+ SQLException(short fHandleType,
void* hInput, const char* prolog,
log4cxx::helpers::Pool& p);
SQLException(const char* msg);
@@ -279,13 +279,13 @@ namespace log4cxx
private:
ODBCAppender(const ODBCAppender&);
ODBCAppender& operator=(const ODBCAppender&);
- static void encode(wchar_t** dest, const LogString& src,
+ static void encode(wchar_t** dest, const LogString& src,
log4cxx::helpers::Pool& p);
- static void encode(unsigned short** dest, const LogString& src,
+ static void encode(unsigned short** dest, const LogString& src,
log4cxx::helpers::Pool& p);
}; // class ODBCAppender
LOG4CXX_PTR_DEF(ODBCAppender);
-
+
} // namespace db
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/defaultloggerfactory.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/defaultloggerfactory.h b/src/main/include/log4cxx/defaultloggerfactory.h
index 3f3c674..17c2685 100644
--- a/src/main/include/log4cxx/defaultloggerfactory.h
+++ b/src/main/include/log4cxx/defaultloggerfactory.h
@@ -37,7 +37,7 @@ namespace log4cxx
END_LOG4CXX_CAST_MAP()
virtual LoggerPtr makeNewLoggerInstance(
- log4cxx::helpers::Pool& pool,
+ log4cxx::helpers::Pool& pool,
const LogString& name) const;
};
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/file.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/file.h b/src/main/include/log4cxx/file.h
index a762949..e723b98 100644
--- a/src/main/include/log4cxx/file.h
+++ b/src/main/include/log4cxx/file.h
@@ -90,13 +90,13 @@ namespace log4cxx
File(const File& src);
/**
* Assignment operator.
- */
+ */
File& operator=(const File& src);
/**
* Destructor.
*/
~File();
-
+
/**
* Determines if file exists.
* @param p pool.
@@ -161,7 +161,7 @@ namespace log4cxx
* @return true if file successfully renamed.
*/
bool renameTo(const File& dest, log4cxx::helpers::Pool& p) const;
-
+
/**
* Get path of parent directory.
* @param p pool.
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/filter/andfilter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/filter/andfilter.h b/src/main/include/log4cxx/filter/andfilter.h
index 4b284b8..9f962ac 100644
--- a/src/main/include/log4cxx/filter/andfilter.h
+++ b/src/main/include/log4cxx/filter/andfilter.h
@@ -72,7 +72,7 @@ namespace log4cxx
* or
* ! ( LEVEL == DEBUG && MSG ~= 'test' )
*
- *
+ *
*/
class LOG4CXX_EXPORT AndFilter:public log4cxx::spi::Filter
{
@@ -95,7 +95,7 @@ namespace log4cxx
void addFilter(const log4cxx::spi::FilterPtr & filter);
void setAcceptOnMatch(bool acceptOnMatch);
-
+
FilterDecision decide(const spi::LoggingEventPtr & event) const;
};
LOG4CXX_PTR_DEF(AndFilter);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/filter/expressionfilter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/filter/expressionfilter.h b/src/main/include/log4cxx/filter/expressionfilter.h
index dfb6cbf..e2a3ce9 100644
--- a/src/main/include/log4cxx/filter/expressionfilter.h
+++ b/src/main/include/log4cxx/filter/expressionfilter.h
@@ -79,7 +79,7 @@ namespace log4cxx
*
* If there is no match, {@link log4cxx::spi::Filter#NEUTRAL} is returned.
*
- *
+ *
*/
class LOG4CXX_EXPORT ExpressionFilter:public log4cxx::spi::Filter
{
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/filter/locationinfofilter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/filter/locationinfofilter.h b/src/main/include/log4cxx/filter/locationinfofilter.h
index 81d8b18..b31f476 100644
--- a/src/main/include/log4cxx/filter/locationinfofilter.h
+++ b/src/main/include/log4cxx/filter/locationinfofilter.h
@@ -41,7 +41,7 @@ namespace log4cxx
*
* For information on expression syntax, see org.apache.log4j.rule.ExpressionRule
*
- *
+ *
*/
class LOG4CXX_EXPORT LocationInfoFilter:public log4cxx::spi::Filter
{