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:03 UTC
[2/6] logging-log4cxx git commit: LOGCXX-500: Remove unnecessary
whitespace for easier applying of patches.
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/cpp/telnetappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/telnetappender.cpp b/src/main/cpp/telnetappender.cpp
index b8bf951..944e798 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/8c3fe024/src/main/cpp/threadcxx.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/threadcxx.cpp b/src/main/cpp/threadcxx.cpp
index 777b128..63dacbe 100644
--- a/src/main/cpp/threadcxx.cpp
+++ b/src/main/cpp/threadcxx.cpp
@@ -69,7 +69,7 @@ void Thread::run(Runnable start, void* data) {
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,
@@ -90,7 +90,7 @@ Thread::LaunchStatus::LaunchStatus(volatile unsigned int* p) : alive(p) {
Thread::LaunchStatus::~LaunchStatus() {
apr_atomic_set32(alive, 0);
}
-
+
#if APR_HAS_THREADS
void* LOG4CXX_THREAD_FUNC Thread::launcher(apr_thread_t* thread, void* data) {
LaunchPackage* package = (LaunchPackage*) data;
@@ -168,7 +168,7 @@ void Thread::sleep(int duration) {
if(interrupted()) {
throw InterruptedException();
}
-#endif
+#endif
if (duration > 0) {
apr_sleep(duration*1000);
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/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/8c3fe024/src/main/cpp/threadspecificdata.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/threadspecificdata.cpp b/src/main/cpp/threadspecificdata.cpp
index 1bfa269..63b9901 100644
--- a/src/main/cpp/threadspecificdata.cpp
+++ b/src/main/cpp/threadspecificdata.cpp
@@ -54,7 +54,7 @@ ThreadSpecificData* ThreadSpecificData::getCurrentData() {
apr_threadkey_private_get(&pData, APRInitializer::getTlsKey());
return (ThreadSpecificData*) pData;
#else
- return &getDataNoThreads();
+ return &getDataNoThreads();
#endif
}
@@ -70,7 +70,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/8c3fe024/src/main/cpp/transcoder.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/transcoder.cpp b/src/main/cpp/transcoder.cpp
index 2b4801c..ba1de81 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/8c3fe024/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/8c3fe024/src/main/cpp/writerappender.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/writerappender.cpp b/src/main/cpp/writerappender.cpp
index c54c5fe..97144be 100644
--- a/src/main/cpp/writerappender.cpp
+++ b/src/main/cpp/writerappender.cpp
@@ -258,7 +258,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/8c3fe024/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/8c3fe024/src/main/cpp/zipcompressaction.cpp
----------------------------------------------------------------------
diff --git a/src/main/cpp/zipcompressaction.cpp b/src/main/cpp/zipcompressaction.cpp
index 0a76b4f..f69438d 100644
--- a/src/main/cpp/zipcompressaction.cpp
+++ b/src/main/cpp/zipcompressaction.cpp
@@ -39,10 +39,10 @@ bool ZipCompressAction::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_NO_PIPE, 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);
@@ -57,7 +57,7 @@ bool ZipCompressAction::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, 5 *sizeof(*args));
int i = 0;
args[i++] = "zip";
@@ -65,7 +65,7 @@ bool ZipCompressAction::execute(log4cxx::helpers::Pool& p) const {
args[i++] = Transcoder::encode(destination.getPath(), p);
args[i++] = Transcoder::encode(source.getPath(), p);
args[i++] = NULL;
-
+
if (destination.exists(p)) {
destination.deleteFile(p);
}
@@ -75,7 +75,7 @@ bool ZipCompressAction::execute(log4cxx::helpers::Pool& p) const {
if (stat != APR_SUCCESS) throw IOException(stat);
apr_proc_wait(&pid, NULL, NULL, APR_WAIT);
-
+
if (deleteSource) {
source.deleteFile(p);
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/asyncappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/asyncappender.h b/src/main/include/log4cxx/asyncappender.h
index cbe9b3c..a2e7195 100644
--- a/src/main/include/log4cxx/asyncappender.h
+++ b/src/main/include/log4cxx/asyncappender.h
@@ -66,7 +66,7 @@ namespace log4cxx
* Create new instance.
*/
AsyncAppender();
-
+
/**
* Destructor.
*/
@@ -96,7 +96,7 @@ namespace log4cxx
* @return list of all attached appenders.
*/
AppenderList getAllAppenders() const;
-
+
/**
* Get appender by name.
*
@@ -120,7 +120,7 @@ namespace log4cxx
bool isAttached(const AppenderPtr& appender) const;
virtual bool requiresLayout() const;
-
+
/**
* Removes and closes all attached appenders.
*/
@@ -135,7 +135,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
@@ -173,8 +173,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/8c3fe024/src/main/include/log4cxx/consoleappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/consoleappender.h b/src/main/include/log4cxx/consoleappender.h
index f77ac02..f9a0681 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/8c3fe024/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/8c3fe024/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 0d278e2..116a385 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);
@@ -281,7 +281,7 @@ namespace log4cxx
ODBCAppender& operator=(const ODBCAppender&);
}; // class ODBCAppender
LOG4CXX_PTR_DEF(ODBCAppender);
-
+
} // namespace db
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/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/8c3fe024/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/8c3fe024/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 3bc58a0..4f98886 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
{
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/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/8c3fe024/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
{
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/filter/propertyfilter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/filter/propertyfilter.h b/src/main/include/log4cxx/filter/propertyfilter.h
index 4d830e1..d38d02b 100644
--- a/src/main/include/log4cxx/filter/propertyfilter.h
+++ b/src/main/include/log4cxx/filter/propertyfilter.h
@@ -48,7 +48,7 @@ namespace log4cxx
* Example properties param:
* somename=somevalue,anothername=anothervalue,thirdname=third value
*
- *
+ *
*/
class LOG4CXX_EXPORT PropertyFilter : public log4cxx::spi::Filter
{
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/appenderattachableimpl.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/appenderattachableimpl.h b/src/main/include/log4cxx/helpers/appenderattachableimpl.h
index d254e34..62e1dcf 100644
--- a/src/main/include/log4cxx/helpers/appenderattachableimpl.h
+++ b/src/main/include/log4cxx/helpers/appenderattachableimpl.h
@@ -48,10 +48,10 @@ namespace log4cxx
/** Array of appenders. */
AppenderList appenderList;
- public:
+ public:
/**
* Create new instance.
- * @param pool pool, must be longer-lived than instance.
+ * @param pool pool, must be longer-lived than instance.
*/
AppenderAttachableImpl(Pool& pool);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/bytearrayinputstream.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/bytearrayinputstream.h b/src/main/include/log4cxx/helpers/bytearrayinputstream.h
index 92bcb59..1e8a9c4 100755
--- a/src/main/include/log4cxx/helpers/bytearrayinputstream.h
+++ b/src/main/include/log4cxx/helpers/bytearrayinputstream.h
@@ -60,7 +60,7 @@ namespace log4cxx
virtual ~ByteArrayInputStream();
/**
- * Closes this file input stream and releases any system
+ * Closes this file input stream and releases any system
* resources associated with the stream.
*/
virtual void close();
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/charsetdecoder.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/charsetdecoder.h b/src/main/include/log4cxx/helpers/charsetdecoder.h
index cb8320a..e2b1ea1 100644
--- a/src/main/include/log4cxx/helpers/charsetdecoder.h
+++ b/src/main/include/log4cxx/helpers/charsetdecoder.h
@@ -72,8 +72,8 @@ namespace log4cxx
* Get decoder for ISO-8859-1.
*/
static CharsetDecoderPtr getISOLatinDecoder();
-
-
+
+
/**
* Decodes as many bytes as possible from the given
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/condition.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/condition.h b/src/main/include/log4cxx/helpers/condition.h
index 7adb3bc..3da4262 100755
--- a/src/main/include/log4cxx/helpers/condition.h
+++ b/src/main/include/log4cxx/helpers/condition.h
@@ -33,7 +33,7 @@ namespace log4cxx
/**
* This class provides a means for one thread to suspend exception until
- * notified by another thread to resume. This class should have
+ * notified by another thread to resume. This class should have
* similar semantics to java.util.concurrent.locks.Condition.
*/
class LOG4CXX_EXPORT Condition
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/cyclicbuffer.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/cyclicbuffer.h b/src/main/include/log4cxx/helpers/cyclicbuffer.h
index 2cd913d..dbf9ce9 100644
--- a/src/main/include/log4cxx/helpers/cyclicbuffer.h
+++ b/src/main/include/log4cxx/helpers/cyclicbuffer.h
@@ -26,7 +26,7 @@ namespace log4cxx
{
/**
CyclicBuffer is used by other appenders to hold instances of
- {@link log4cxx::spi::LoggingEvent LoggingEvent} for immediate
+ {@link log4cxx::spi::LoggingEvent LoggingEvent} for immediate
or deferred display.
<p>This buffer gives read access to any element in the buffer not
just the first or last element.
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/exception.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/exception.h b/src/main/include/log4cxx/helpers/exception.h
index fb1daf5..0bfcae8 100644
--- a/src/main/include/log4cxx/helpers/exception.h
+++ b/src/main/include/log4cxx/helpers/exception.h
@@ -250,7 +250,7 @@ namespace log4cxx
BindException(const BindException&);
BindException& operator=(const BindException&);
};
-
+
/** Signals that an I/O operation has been interrupted. An
InterruptedIOException is thrown to indicate that an input or output
transfer has been terminated because the thread performing it was
@@ -265,7 +265,7 @@ namespace log4cxx
InterruptedIOException& operator=(const InterruptedIOException&);
};
-
+
/** Signals that an I/O operation has been interrupted. An
InterruptedIOException is thrown to indicate that an input or output
transfer has been terminated because the thread performing it was
@@ -279,7 +279,7 @@ namespace log4cxx
SocketTimeoutException(const SocketTimeoutException&);
SocketTimeoutException& operator=(const SocketTimeoutException&);
};
-
+
} // namespace helpers
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/fileinputstream.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/fileinputstream.h b/src/main/include/log4cxx/helpers/fileinputstream.h
index fdf658a..bfd4f92 100644
--- a/src/main/include/log4cxx/helpers/fileinputstream.h
+++ b/src/main/include/log4cxx/helpers/fileinputstream.h
@@ -30,7 +30,7 @@ namespace log4cxx
/**
* InputStream implemented on top of APR file IO.
- *
+ *
*/
class LOG4CXX_EXPORT FileInputStream : public InputStream
{
@@ -55,7 +55,7 @@ namespace log4cxx
FileInputStream(const logchar* filename);
/**
- * Creates a FileInputStream by opening a connection to an actual
+ * Creates a FileInputStream by opening a connection to an actual
* file, the file named by the File object file in the file system.
*
* @param aFile The file to be opened for reading.
@@ -65,7 +65,7 @@ namespace log4cxx
virtual ~FileInputStream();
/**
- * Closes this file input stream and releases any system
+ * Closes this file input stream and releases any system
* resources associated with the stream.
*/
virtual void close();
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/fileoutputstream.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/fileoutputstream.h b/src/main/include/log4cxx/helpers/fileoutputstream.h
index b9e405a..74927ac 100644
--- a/src/main/include/log4cxx/helpers/fileoutputstream.h
+++ b/src/main/include/log4cxx/helpers/fileoutputstream.h
@@ -55,7 +55,7 @@ namespace log4cxx
private:
FileOutputStream(const FileOutputStream&);
FileOutputStream& operator=(const FileOutputStream&);
- static apr_file_t* open(const LogString& fn, bool append,
+ static apr_file_t* open(const LogString& fn, bool append,
log4cxx::helpers::Pool& p);
};
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/inputstream.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/inputstream.h b/src/main/include/log4cxx/helpers/inputstream.h
index 585d4f0..2885212 100644
--- a/src/main/include/log4cxx/helpers/inputstream.h
+++ b/src/main/include/log4cxx/helpers/inputstream.h
@@ -28,7 +28,7 @@ namespace log4cxx
/**
* Abstract class for reading from character streams.
- *
+ *
*/
class LOG4CXX_EXPORT InputStream : public ObjectImpl
{
@@ -54,7 +54,7 @@ namespace log4cxx
virtual int read(ByteBuffer& dst) = 0;
/**
- * Closes this input stream and releases any system
+ * Closes this input stream and releases any system
* resources associated with the stream.
*/
virtual void close() = 0;
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/inputstreamreader.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/inputstreamreader.h b/src/main/include/log4cxx/helpers/inputstreamreader.h
index 1f186d9..b2f1057 100644
--- a/src/main/include/log4cxx/helpers/inputstreamreader.h
+++ b/src/main/include/log4cxx/helpers/inputstreamreader.h
@@ -29,7 +29,7 @@ namespace log4cxx
/**
* Class for reading from character streams.
- * Decorates a byte based InputStream and provides appropriate
+ * Decorates a byte based InputStream and provides appropriate
* conversion to characters.
*/
class LOG4CXX_EXPORT InputStreamReader : public Reader
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/loglog.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/loglog.h b/src/main/include/log4cxx/helpers/loglog.h
index 3c1f133..913a0ef 100644
--- a/src/main/include/log4cxx/helpers/loglog.h
+++ b/src/main/include/log4cxx/helpers/loglog.h
@@ -53,7 +53,7 @@ namespace log4cxx
LogLog(const LogLog&);
LogLog& operator=(const LogLog&);
static LogLog& getInstance();
-
+
public:
/**
@@ -84,7 +84,7 @@ namespace log4cxx
@param quietMode <code>true</code> for no output.
*/
- static void setQuietMode(bool quietMode);
+ static void setQuietMode(bool quietMode);
/**
This method is used to output log4cxx internal warning
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/messagebuffer.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/messagebuffer.h b/src/main/include/log4cxx/helpers/messagebuffer.h
index c026dc5..3335caf 100644
--- a/src/main/include/log4cxx/helpers/messagebuffer.h
+++ b/src/main/include/log4cxx/helpers/messagebuffer.h
@@ -26,7 +26,7 @@ namespace log4cxx {
namespace helpers {
-
+
typedef std::ios_base& (*ios_base_manip)(std::ios_base&);
/**
@@ -45,7 +45,7 @@ namespace log4cxx {
*/
~CharMessageBuffer();
-
+
/**
* Appends string to buffer.
* @param msg string append.
@@ -171,7 +171,7 @@ namespace log4cxx {
*/
CharMessageBuffer(const CharMessageBuffer&);
/**
- * Prevent use of default assignment operator.
+ * Prevent use of default assignment operator.
*/
CharMessageBuffer& operator=(const CharMessageBuffer&);
@@ -206,10 +206,10 @@ std::basic_ostream<char>& operator<<(CharMessageBuffer& os, const V& val) {
* Destructor.
*/
~UniCharMessageBuffer();
-
+
typedef std::basic_ostream<UniChar> uostream;
-
+
/**
* Appends string to buffer.
* @param msg string append.
@@ -235,7 +235,7 @@ std::basic_ostream<char>& operator<<(CharMessageBuffer& os, const V& val) {
* @return this buffer.
*/
UniCharMessageBuffer& operator<<(const UniChar msg);
-
+
#if LOG4CXX_CFSTRING_API
/**
* Appends a string into the buffer and
@@ -244,7 +244,7 @@ std::basic_ostream<char>& operator<<(CharMessageBuffer& os, const V& val) {
* @return encapsulated CharMessageBuffer.
*/
UniCharMessageBuffer& operator<<(const CFStringRef& msg);
-#endif
+#endif
/**
* Insertion operator for STL manipulators such as std::fixed.
@@ -346,7 +346,7 @@ std::basic_ostream<char>& operator<<(CharMessageBuffer& os, const V& val) {
*/
UniCharMessageBuffer(const UniCharMessageBuffer&);
/**
- * Prevent use of default assignment operator.
+ * Prevent use of default assignment operator.
*/
UniCharMessageBuffer& operator=(const UniCharMessageBuffer&);
@@ -383,7 +383,7 @@ UniCharMessageBuffer::uostream& operator<<(UniCharMessageBuffer& os, const V& va
*/
~WideMessageBuffer();
-
+
/**
* Appends string to buffer.
* @param msg string append.
@@ -510,7 +510,7 @@ UniCharMessageBuffer::uostream& operator<<(UniCharMessageBuffer& os, const V& va
*/
WideMessageBuffer(const WideMessageBuffer&);
/**
- * Prevent use of default assignment operator.
+ * Prevent use of default assignment operator.
*/
WideMessageBuffer& operator=(const WideMessageBuffer&);
@@ -590,7 +590,7 @@ std::basic_ostream<wchar_t>& operator<<(WideMessageBuffer& os, const V& val) {
/**
* Get content of buffer.
- * @param os used only to signal
+ * @param os used only to signal
* the character type and that
* the embedded stream was used.
*/
@@ -744,12 +744,12 @@ std::basic_ostream<wchar_t>& operator<<(WideMessageBuffer& os, const V& val) {
/**
* Get content of buffer.
- * @param os used only to signal
+ * @param os used only to signal
* the character type and that
* the embedded stream was used.
*/
const std::wstring& str(std::basic_ostream<wchar_t>& os);
-
+
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
/**
* Get content of buffer.
@@ -761,12 +761,12 @@ std::basic_ostream<wchar_t>& operator<<(WideMessageBuffer& os, const V& val) {
/**
* Get content of buffer.
- * @param os used only to signal
+ * @param os used only to signal
* the character type and that
* the embedded stream was used.
*/
const std::basic_string<UniChar>& str(UniCharMessageBuffer::uostream& os);
-#endif
+#endif
/**
* Returns true if buffer has an encapsulated STL stream.
@@ -780,7 +780,7 @@ std::basic_ostream<wchar_t>& operator<<(WideMessageBuffer& os, const V& val) {
*/
MessageBuffer(const MessageBuffer&);
/**
- * Prevent use of default assignment operator.
+ * Prevent use of default assignment operator.
*/
MessageBuffer& operator=(const MessageBuffer&);
@@ -792,13 +792,13 @@ std::basic_ostream<wchar_t>& operator<<(WideMessageBuffer& os, const V& val) {
/**
* Encapsulated wide message buffer, created on demand.
*/
- WideMessageBuffer* wbuf;
+ WideMessageBuffer* wbuf;
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
/**
* Encapsulated wide message buffer, created on demand.
*/
- UniCharMessageBuffer* ubuf;
-#endif
+ UniCharMessageBuffer* ubuf;
+#endif
};
template<class V>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/objectoutputstream.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/objectoutputstream.h b/src/main/include/log4cxx/helpers/objectoutputstream.h
index 92f56fe..4cb0852 100644
--- a/src/main/include/log4cxx/helpers/objectoutputstream.h
+++ b/src/main/include/log4cxx/helpers/objectoutputstream.h
@@ -77,15 +77,15 @@ namespace log4cxx
private:
ObjectOutputStream(const ObjectOutputStream&);
ObjectOutputStream& operator=(const ObjectOutputStream&);
-
+
OutputStreamPtr os;
log4cxx::helpers::CharsetEncoderPtr utf8Encoder;
unsigned int objectHandle;
typedef std::map<std::string, unsigned int> ClassDescriptionMap;
ClassDescriptionMap* classDescriptions;
};
-
- LOG4CXX_PTR_DEF(ObjectOutputStream);
+
+ LOG4CXX_PTR_DEF(ObjectOutputStream);
} // namespace helpers
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/objectptr.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/objectptr.h b/src/main/include/log4cxx/helpers/objectptr.h
index 4271ba1..d81f6fa 100644
--- a/src/main/include/log4cxx/helpers/objectptr.h
+++ b/src/main/include/log4cxx/helpers/objectptr.h
@@ -28,7 +28,7 @@
// switching between the initialization styles.
//
#if LOG4CXX_HELGRIND
-#define _LOG4CXX_OBJECTPTR_INIT(x) { exchange(x);
+#define _LOG4CXX_OBJECTPTR_INIT(x) { exchange(x);
#else
#define _LOG4CXX_OBJECTPTR_INIT(x) : p(x) {
#endif
@@ -53,7 +53,7 @@ namespace log4cxx
template<typename T> class ObjectPtrT : public ObjectPtrBase
{
public:
- ObjectPtrT(const int& null)
+ ObjectPtrT(const int& null)
_LOG4CXX_OBJECTPTR_INIT(0)
ObjectPtrBase::checkNull(null);
}
@@ -79,14 +79,14 @@ namespace log4cxx
}
}
- ObjectPtrT(const ObjectPtrBase& p1)
+ ObjectPtrT(const ObjectPtrBase& p1)
_LOG4CXX_OBJECTPTR_INIT(reinterpret_cast<T*>(p1.cast(T::getStaticClass())))
if (this->p != 0) {
this->p->addRef();
}
}
- ObjectPtrT(ObjectPtrBase& p1)
+ ObjectPtrT(ObjectPtrBase& p1)
_LOG4CXX_OBJECTPTR_INIT(reinterpret_cast<T*>(p1.cast(T::getStaticClass())))
if (this->p != 0) {
this->p->addRef();
@@ -150,10 +150,10 @@ namespace log4cxx
bool operator==(const ObjectPtrT& p1) const { return (this->p == p1.p); }
bool operator!=(const ObjectPtrT& p1) const { return (this->p != p1.p); }
- bool operator<(const ObjectPtrT& p1) const { return (this->p < p1.p); }
+ bool operator<(const ObjectPtrT& p1) const { return (this->p < p1.p); }
bool operator==(const T* p1) const { return (this->p == p1); }
bool operator!=(const T* p1) const { return (this->p != p1); }
- bool operator<(const T* p1) const { return (this->p < p1); }
+ bool operator<(const T* p1) const { return (this->p < p1); }
T* operator->() const {return p; }
T& operator*() const {return *p; }
operator T*() const {return p; }
@@ -170,7 +170,7 @@ namespace log4cxx
}
T* exchange(const T* newValue) {
return static_cast<T*>(ObjectPtrBase::exchange(
- reinterpret_cast<void**>(&p),
+ reinterpret_cast<void**>(&p),
const_cast<T*>(newValue)));
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/optionconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/optionconverter.h b/src/main/include/log4cxx/helpers/optionconverter.h
index 6b4561c..0aa3115 100644
--- a/src/main/include/log4cxx/helpers/optionconverter.h
+++ b/src/main/include/log4cxx/helpers/optionconverter.h
@@ -110,7 +110,7 @@ balanced by a stop delimeter "}". </p>
static LogString substVars(const LogString& val, Properties& props);
/**
- * Gets the specified system property.
+ * Gets the specified system property.
@param key The key to search for.
@param def The default value to return.
@return the string value of the system property, or the default
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/reader.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/reader.h b/src/main/include/log4cxx/helpers/reader.h
index f61ca66..488b5fd 100644
--- a/src/main/include/log4cxx/helpers/reader.h
+++ b/src/main/include/log4cxx/helpers/reader.h
@@ -27,7 +27,7 @@ namespace log4cxx
/**
* Abstract class for reading from character streams.
- *
+ *
*/
class LOG4CXX_EXPORT Reader : public ObjectImpl
{
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/serversocket.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/serversocket.h b/src/main/include/log4cxx/helpers/serversocket.h
index 7f0c90b..5eee0ee 100644
--- a/src/main/include/log4cxx/helpers/serversocket.h
+++ b/src/main/include/log4cxx/helpers/serversocket.h
@@ -50,13 +50,13 @@ namespace log4cxx
/** Enable/disable SO_TIMEOUT with the specified timeout, in milliseconds.
*/
void setSoTimeout(int timeout);
-
+
private:
Pool pool;
Mutex mutex;
apr_socket_t* socket;
int timeout;
-
+
};
} // namespace helpers
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/simpledateformat.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/simpledateformat.h b/src/main/include/log4cxx/helpers/simpledateformat.h
index 9c27f68..e95ae29 100644
--- a/src/main/include/log4cxx/helpers/simpledateformat.h
+++ b/src/main/include/log4cxx/helpers/simpledateformat.h
@@ -78,7 +78,7 @@ namespace log4cxx
LOG4CXX_LIST_DEF(PatternTokenList, log4cxx::helpers::SimpleDateFormatImpl::PatternToken*);
PatternTokenList pattern;
-
+
static void addToken(const logchar spec, const int repeat, const std::locale* locale, PatternTokenList& pattern);
static void parsePattern(const LogString& spec, const std::locale* locale, PatternTokenList& pattern);
};
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/socket.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/socket.h b/src/main/include/log4cxx/helpers/socket.h
index 2f1636b..6b41a64 100644
--- a/src/main/include/log4cxx/helpers/socket.h
+++ b/src/main/include/log4cxx/helpers/socket.h
@@ -31,7 +31,7 @@ namespace log4cxx
{
namespace helpers
{
- class ByteBuffer;
+ class ByteBuffer;
/**
<p>This class implements client sockets (also called just "sockets"). A socket
is an endpoint for communication between two machines.
@@ -59,7 +59,7 @@ namespace log4cxx
/** Closes this socket. */
void close();
-
+
/** Returns the value of this socket's address field. */
InetAddressPtr getInetAddress() const;
@@ -68,9 +68,9 @@ namespace log4cxx
private:
Socket(const Socket&);
Socket& operator=(const Socket&);
-
+
Pool pool;
-
+
apr_socket_t* socket;
@@ -81,9 +81,9 @@ namespace log4cxx
this socket is connected. */
int port;
};
-
+
LOG4CXX_PTR_DEF(Socket);
-
+
} // namespace helpers
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/socketoutputstream.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/socketoutputstream.h b/src/main/include/log4cxx/helpers/socketoutputstream.h
index 6bca173..511e4b3 100644
--- a/src/main/include/log4cxx/helpers/socketoutputstream.h
+++ b/src/main/include/log4cxx/helpers/socketoutputstream.h
@@ -59,9 +59,9 @@ namespace log4cxx
SocketOutputStream& operator=(const SocketOutputStream&);
};
-
+
LOG4CXX_PTR_DEF(SocketOutputStream);
-
+
} // namespace helpers
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/systemoutwriter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/systemoutwriter.h b/src/main/include/log4cxx/helpers/systemoutwriter.h
index af7c55b..9838e71 100644
--- a/src/main/include/log4cxx/helpers/systemoutwriter.h
+++ b/src/main/include/log4cxx/helpers/systemoutwriter.h
@@ -38,11 +38,11 @@ namespace log4cxx
SystemOutWriter();
~SystemOutWriter();
-
+
virtual void close(Pool& p);
virtual void flush(Pool& p);
virtual void write(const LogString& str, Pool& p);
-
+
static void write(const LogString& str);
static void flush();
private:
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/thread.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/thread.h b/src/main/include/log4cxx/helpers/thread.h
index 09a47d6..be3d407 100644
--- a/src/main/include/log4cxx/helpers/thread.h
+++ b/src/main/include/log4cxx/helpers/thread.h
@@ -73,11 +73,11 @@ namespace log4cxx
*/
static void sleep(int millis);
/**
- * Sets interrupted status for current thread to true.
+ * Sets interrupted status for current thread to true.
*/
static void currentThreadInterrupt();
/**
- * Sets interrupted status to true.
+ * Sets interrupted status to true.
*/
void interrupt();
/**
@@ -85,11 +85,11 @@ namespace log4cxx
* sets the interrupted status to false.
*/
static bool interrupted();
-
+
bool isAlive();
bool isCurrentThread() const;
void ending();
-
+
private:
Pool p;
@@ -98,7 +98,7 @@ namespace log4cxx
volatile unsigned int interruptedStatus;
Thread(const Thread&);
Thread& operator=(const Thread&);
-
+
/**
* This class is used to encapsulate the parameters to
* Thread::run when they are passed to Thread::launcher.
@@ -140,13 +140,13 @@ namespace log4cxx
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 {
@@ -165,7 +165,7 @@ namespace log4cxx
LaunchStatus& operator=(const LaunchStatus&);
volatile unsigned int* alive;
};
-
+
/**
* This method runs on the created thread and sets up thread-local storage
* used to keep the reference to the corresponding Thread object and
@@ -175,7 +175,7 @@ namespace log4cxx
/**
* Get a key to the thread local storage used to hold the reference to
* the corresponding Thread object.
- */
+ */
static ThreadLocal& getThreadLocal();
};
} // namespace helpers
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/threadlocal.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/threadlocal.h b/src/main/include/log4cxx/helpers/threadlocal.h
index 9275811..c4985af 100644
--- a/src/main/include/log4cxx/helpers/threadlocal.h
+++ b/src/main/include/log4cxx/helpers/threadlocal.h
@@ -57,23 +57,23 @@ namespace log4cxx
* Sets the value in the current thread's copy of this thread-local variable.
* @param priv new value.
*/
- void set(void* priv);
+ void set(void* priv);
/**
* Returns the value in the current thread's copy of this thread-local variable.
* @return value of thread-local variable for the current thread.
*/
void* get();
-
+
private:
/**
* Prevent use of default copy constructor.
*/
ThreadLocal(const ThreadLocal&);
/**
- * Prevent use of default assignment operator.
+ * Prevent use of default assignment operator.
*/
ThreadLocal& operator=(const ThreadLocal&);
-
+
static apr_threadkey_t* create(Pool& p);
Pool p;
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/threadspecificdata.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/threadspecificdata.h b/src/main/include/log4cxx/helpers/threadspecificdata.h
index b02cf51..04fe098 100644
--- a/src/main/include/log4cxx/helpers/threadspecificdata.h
+++ b/src/main/include/log4cxx/helpers/threadspecificdata.h
@@ -45,14 +45,14 @@ namespace log4cxx
* Release this ThreadSpecficData if empty.
*/
void recycle();
-
+
static void put(const LogString& key, const LogString& val);
static void push(const LogString& val);
static void inherit(const log4cxx::NDC::Stack& stack);
-
+
log4cxx::NDC::Stack& getStack();
log4cxx::MDC::Map& getMap();
-
+
private:
static ThreadSpecificData& getDataNoThreads();
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/helpers/transcoder.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/transcoder.h b/src/main/include/log4cxx/helpers/transcoder.h
index 0559ba9..4336518 100644
--- a/src/main/include/log4cxx/helpers/transcoder.h
+++ b/src/main/include/log4cxx/helpers/transcoder.h
@@ -39,7 +39,7 @@ namespace log4cxx {
class LOG4CXX_EXPORT Transcoder {
public:
-
+
/**
* Appends this specified string of UTF-8 characters to LogString.
*/
@@ -64,7 +64,7 @@ namespace log4cxx {
* Append UCS-4 code point to a byte buffer as UTF-16BE.
*/
static void encodeUTF16BE(unsigned int sv, ByteBuffer& dst);
-
+
/**
* Decodes next character from a UTF-8 string.
@@ -90,14 +90,14 @@ namespace log4cxx {
static void decode(const std::string& src, LogString& dst);
/**
* Appends a LogString to a string in the current
- * code-page. Unrepresentable characters may be
+ * code-page. Unrepresentable characters may be
* replaced with loss characters.
*/
static void encode(const LogString& src, std::string& dst);
/**
* Encodes the specified LogString to the current
- * character set.
+ * character set.
* @param src string to encode.
* @param p pool from which to allocate return value.
* @return pool allocated string.
@@ -134,7 +134,7 @@ namespace log4cxx {
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API || LOG4CXX_LOGCHAR_IS_UNICHAR
static void decode(const std::basic_string<UniChar>& src, LogString& dst);
static void encode(const LogString& src, std::basic_string<UniChar>& dst);
-
+
/**
* Decodes next character from a UniChar string.
* @param in string from which the character is extracted.
@@ -160,7 +160,7 @@ namespace log4cxx {
#endif
enum { LOSSCHAR = 0x3F };
-
+
/**
* Returns a logchar value given a character literal in the ASCII charset.
* Used to implement the LOG4CXX_STR macro for EBCDIC and UNICHAR.
@@ -173,7 +173,7 @@ namespace log4cxx {
static LogString decode(const char* v);
/**
- * Encodes a charset name in the default encoding
+ * Encodes a charset name in the default encoding
* without using a CharsetEncoder (which could trigger recursion).
*/
static std::string encodeCharsetName(const LogString& charsetName);
@@ -188,7 +188,7 @@ namespace log4cxx {
static size_t encodeUTF8(unsigned int ch, char* dst);
static size_t encodeUTF16BE(unsigned int ch, char* dst);
static size_t encodeUTF16LE(unsigned int ch, char* dst);
-
+
};
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/layout.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/layout.h b/src/main/include/log4cxx/layout.h
index b07d650..22ca17e 100644
--- a/src/main/include/log4cxx/layout.h
+++ b/src/main/include/log4cxx/layout.h
@@ -45,7 +45,7 @@ namespace log4cxx
LOG4CXX_CAST_ENTRY(Layout)
LOG4CXX_CAST_ENTRY(spi::OptionHandler)
END_LOG4CXX_CAST_MAP()
-
+
virtual ~Layout();
void addRef() const;
void releaseRef() const;
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/level.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/level.h b/src/main/include/log4cxx/level.h
index e675e45..4cc4134 100644
--- a/src/main/include/log4cxx/level.h
+++ b/src/main/include/log4cxx/level.h
@@ -82,7 +82,7 @@ namespace log4cxx
<code>defaultLevel</code>.
* @param sArg level name.
* @param defaultLevel level to return if no match.
- * @return
+ * @return
*/
static LevelPtr toLevel(const std::string& sArg,
const LevelPtr& defaultLevel);
@@ -105,7 +105,7 @@ namespace log4cxx
<code>defaultLevel</code>.
* @param sArg level name.
* @param defaultLevel level to return if no match.
- * @return
+ * @return
*/
static LevelPtr toLevel(const std::wstring& sArg,
const LevelPtr& defaultLevel);
@@ -128,7 +128,7 @@ namespace log4cxx
<code>defaultLevel</code>.
* @param sArg level name.
* @param defaultLevel level to return if no match.
- * @return
+ * @return
*/
static LevelPtr toLevel(const std::basic_string<UniChar>& sArg,
const LevelPtr& defaultLevel);
@@ -151,7 +151,7 @@ namespace log4cxx
<code>defaultLevel</code>.
* @param sArg level name.
* @param defaultLevel level to return if no match.
- * @return
+ * @return
*/
static LevelPtr toLevel(const CFStringRef& sArg,
const LevelPtr& defaultLevel);
@@ -173,7 +173,7 @@ namespace log4cxx
<code>defaultLevel</code>.
* @param sArg level name.
* @param defaultLevel level to return if no match.
- * @return
+ * @return
*/
static LevelPtr toLevelLS(const LogString& sArg,
const LevelPtr& defaultLevel);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/logger.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/logger.h b/src/main/include/log4cxx/logger.h
index d5b5007..26affb9 100644
--- a/src/main/include/log4cxx/logger.h
+++ b/src/main/include/log4cxx/logger.h
@@ -38,7 +38,7 @@ namespace log4cxx
namespace helpers {
class synchronized;
}
-
+
namespace spi {
class LoggerRepository;
LOG4CXX_PTR_DEF(LoggerRepository);
@@ -66,7 +66,7 @@ namespace log4cxx
LOG4CXX_CAST_ENTRY(Logger)
LOG4CXX_CAST_ENTRY(spi::AppenderAttachable)
END_LOG4CXX_CAST_MAP()
-
+
private:
/**
* Reference to memory pool.
@@ -152,7 +152,7 @@ namespace log4cxx
hierarchy circumventing any evaluation of whether to log or not
to log the particular log request.
- @param event the event to log.
+ @param event the event to log.
@param p memory pool for any allocations needed to process request.
*/
void callAppenders(const log4cxx::spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p) const;
@@ -627,32 +627,32 @@ namespace log4cxx
/**
* Get the logger name.
- * @return logger name as LogString.
+ * @return logger name as LogString.
*/
const LogString getName() const { return name; }
/**
* Get logger name in current encoding.
- * @param name buffer to which name is appended.
+ * @param name buffer to which name is appended.
*/
void getName(std::string& name) const;
#if LOG4CXX_WCHAR_T_API
/**
* Get logger name.
- * @param name buffer to which name is appended.
+ * @param name buffer to which name is appended.
*/
void getName(std::wstring& name) const;
#endif
#if LOG4CXX_UNICHAR_API
/**
* Get logger name.
- * @param name buffer to which name is appended.
+ * @param name buffer to which name is appended.
*/
void getName(std::basic_string<UniChar>& name) const;
#endif
#if LOG4CXX_CFSTRING_API
/**
* Get logger name.
- * @param name buffer to which name is appended.
+ * @param name buffer to which name is appended.
*/
void getName(CFStringRef& name) const;
#endif
@@ -675,43 +675,43 @@ namespace log4cxx
/**
* Retrieve a logger by name in current encoding.
- * @param name logger name.
+ * @param name logger name.
*/
static LoggerPtr getLogger(const std::string& name);
/**
* Retrieve a logger by name in current encoding.
- * @param name logger name.
+ * @param name logger name.
*/
static LoggerPtr getLogger(const char* const name);
#if LOG4CXX_WCHAR_T_API
/**
* Retrieve a logger by name.
- * @param name logger name.
+ * @param name logger name.
*/
static LoggerPtr getLogger(const std::wstring& name);
/**
* Retrieve a logger by name.
- * @param name logger name.
+ * @param name logger name.
*/
static LoggerPtr getLogger(const wchar_t* const name);
#endif
#if LOG4CXX_UNICHAR_API
/**
* Retrieve a logger by name.
- * @param name logger name.
+ * @param name logger name.
*/
static LoggerPtr getLogger(const std::basic_string<UniChar>& name);
#endif
#if LOG4CXX_CFSTRING_API
/**
* Retrieve a logger by name.
- * @param name logger name.
+ * @param name logger name.
*/
static LoggerPtr getLogger(const CFStringRef& name);
#endif
/**
* Retrieve a logger by name in Unicode.
- * @param name logger name.
+ * @param name logger name.
*/
static LoggerPtr getLoggerLS(const LogString& name);
@@ -830,7 +830,7 @@ namespace log4cxx
Log a message string with the INFO level.
<p>This method first checks if this logger is <code>INFO</code>
- enabled by comparing the level of this logger with the
+ enabled by comparing the level of this logger with the
INFO level. If this logger is
<code>INFO</code> enabled, it proceeds to call all the
registered appenders in this logger and also higher in the
@@ -846,7 +846,7 @@ namespace log4cxx
Log a message string with the INFO level.
<p>This method first checks if this logger is <code>INFO</code>
- enabled by comparing the level of this logger with the
+ enabled by comparing the level of this logger with the
INFO level. If this logger is
<code>INFO</code> enabled, it proceeds to call all the
registered appenders in this logger and also higher in the
@@ -860,7 +860,7 @@ namespace log4cxx
Log a message string with the INFO level.
<p>This method first checks if this logger is <code>INFO</code>
- enabled by comparing the level of this logger with the
+ enabled by comparing the level of this logger with the
INFO level. If this logger is
<code>INFO</code> enabled, it proceeds to call all the
registered appenders in this logger and also higher in the
@@ -875,7 +875,7 @@ namespace log4cxx
Log a message string with the INFO level.
<p>This method first checks if this logger is <code>INFO</code>
- enabled by comparing the level of this logger with the
+ enabled by comparing the level of this logger with the
INFO level. If this logger is
<code>INFO</code> enabled, it proceeds to call all the
registered appenders in this logger and also higher in the
@@ -889,7 +889,7 @@ namespace log4cxx
Log a message string with the INFO level.
<p>This method first checks if this logger is <code>INFO</code>
- enabled by comparing the level of this logger with the
+ enabled by comparing the level of this logger with the
INFO level. If this logger is
<code>INFO</code> enabled, it proceeds to call all the
registered appenders in this logger and also higher in the
@@ -904,7 +904,7 @@ namespace log4cxx
Log a message string with the INFO level.
<p>This method first checks if this logger is <code>INFO</code>
- enabled by comparing the level of this logger with the
+ enabled by comparing the level of this logger with the
INFO level. If this logger is
<code>INFO</code> enabled, it proceeds to call all the
registered appenders in this logger and also higher in the
@@ -918,7 +918,7 @@ namespace log4cxx
Log a message string with the INFO level.
<p>This method first checks if this logger is <code>INFO</code>
- enabled by comparing the level of this logger with the
+ enabled by comparing the level of this logger with the
INFO level. If this logger is
<code>INFO</code> enabled, it proceeds to call all the
registered appenders in this logger and also higher in the
@@ -1267,7 +1267,7 @@ namespace log4cxx
*/
void l7dlog(const LevelPtr& level, const std::basic_string<UniChar>& key,
const log4cxx::spi::LocationInfo& locationInfo,
- const std::basic_string<UniChar>& val1, const std::basic_string<UniChar>& val2,
+ const std::basic_string<UniChar>& val1, const std::basic_string<UniChar>& val2,
const std::basic_string<UniChar>& val3) const;
#endif
#if LOG4CXX_CFSTRING_API
@@ -1343,7 +1343,7 @@ namespace log4cxx
*/
void l7dlog(const LevelPtr& level, const CFStringRef& key,
const log4cxx::spi::LocationInfo& locationInfo,
- const CFStringRef& val1, const CFStringRef& val2,
+ const CFStringRef& val1, const CFStringRef& val2,
const CFStringRef& val3) const;
#endif
@@ -1718,7 +1718,7 @@ namespace log4cxx
friend class log4cxx::helpers::synchronized;
};
LOG4CXX_LIST_DEF(LoggerList, LoggerPtr);
-
+
}
/** @addtogroup LoggingMacros Logging macros
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/logmanager.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/logmanager.h b/src/main/include/log4cxx/logmanager.h
index b9ec0b6..a1e2448 100644
--- a/src/main/include/log4cxx/logmanager.h
+++ b/src/main/include/log4cxx/logmanager.h
@@ -40,8 +40,8 @@ namespace log4cxx
/**
* Use the <code>LogManager</code> class to retreive Logger
- * instances or to operate on the current
- * {@link log4cxx::spi::LoggerRepository LoggerRepository}.
+ * instances or to operate on the current
+ * {@link log4cxx::spi::LoggerRepository LoggerRepository}.
* When the <code>LogManager</code> class is loaded
* into memory the default initialization procedure is inititated.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/logstring.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/logstring.h b/src/main/include/log4cxx/logstring.h
index 3bbcdf2..74d2ade 100644
--- a/src/main/include/log4cxx/logstring.h
+++ b/src/main/include/log4cxx/logstring.h
@@ -54,14 +54,14 @@ typedef unsigned short UniChar;
typedef char logchar;
#if LOG4CXX_CHARSET_EBCDIC
#define LOG4CXX_STR(str) log4cxx::helpers::Transcoder::decode(str)
-#else
+#else
#define LOG4CXX_STR(str) str
#endif
#endif
#if LOG4CXX_LOGCHAR_IS_UNICHAR
typedef UniChar logchar;
-#define LOG4CXX_STR(str) log4cxx::helpers::Transcoder::decode(str)
+#define LOG4CXX_STR(str) log4cxx::helpers::Transcoder::decode(str)
#endif
typedef std::basic_string<logchar> LogString;
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/mdc.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/mdc.h b/src/main/include/log4cxx/mdc.h
index f9cd875..3103e76 100644
--- a/src/main/include/log4cxx/mdc.h
+++ b/src/main/include/log4cxx/mdc.h
@@ -100,7 +100,7 @@ namespace log4cxx
* Remove the the context identified by the <code>key</code>
* parameter.
* @param key key.
- * @return value if key had been set, empty if not.
+ * @return value if key had been set, empty if not.
*/
static std::string remove(const std::string& key);
#if LOG4CXX_WCHAR_T_API
@@ -135,7 +135,7 @@ namespace log4cxx
* Remove the the context identified by the <code>key</code>
* parameter.
* @param key key.
- * @return value if key had been set, empty if not.
+ * @return value if key had been set, empty if not.
*/
static std::wstring remove(const std::wstring& key);
#endif
@@ -171,7 +171,7 @@ namespace log4cxx
* Remove the the context identified by the <code>key</code>
* parameter.
* @param key key.
- * @return value if key had been set, empty if not.
+ * @return value if key had been set, empty if not.
*/
static std::basic_string<UniChar> remove(const std::basic_string<UniChar>& key);
#endif
@@ -207,7 +207,7 @@ namespace log4cxx
* Remove the the context identified by the <code>key</code>
* parameter.
* @param key key.
- * @return value if key had been set, empty if not.
+ * @return value if key had been set, empty if not.
*/
static CFStringRef remove(const CFStringRef& key);
#endif
@@ -216,7 +216,7 @@ namespace log4cxx
* parameter.
* @param key key.
* @param prevValue buffer to which previous value is appended.
- * @return true if key existed in MDC.
+ * @return true if key existed in MDC.
*/
static bool remove(const LogString& key, LogString& prevValue);
@@ -228,7 +228,7 @@ namespace log4cxx
private:
MDC(const MDC&);
MDC& operator=(const MDC&);
- LogString key;
+ LogString key;
}; // class MDC;
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/ndc.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/ndc.h b/src/main/include/log4cxx/ndc.h
index 7cf7128..0791d03 100644
--- a/src/main/include/log4cxx/ndc.h
+++ b/src/main/include/log4cxx/ndc.h
@@ -104,7 +104,7 @@ namespace log4cxx
Creates a nested diagnostic context.
Since java performs no automatic cleanup of objects when a
scope is left, in log4j push() and pop() must be used
- to manage the NDC. For convenience, log4cxx provides
+ to manage the NDC. For convenience, log4cxx provides
an NDC constructor and destructor which simply call the push() and
pop() methods, allowing for automatic cleanup when the current
scope ends.
@@ -233,13 +233,13 @@ namespace log4cxx
memory.
*/
static void remove();
-
+
#if LOG4CXX_WCHAR_T_API
/**
Creates a nested diagnostic context.
Since java performs no automatic cleanup of objects when a
scope is left, in log4j push() and pop() must be used
- to manage the NDC. For convenience, log4cxx provides
+ to manage the NDC. For convenience, log4cxx provides
an NDC constructor and destructor which simply call the push() and
pop() methods, allowing for automatic cleanup when the current
scope ends.
@@ -258,13 +258,13 @@ namespace log4cxx
/**
* Appends the current NDC content to the provided string.
* @param dst destination.
- * @return true if NDC value set.
+ * @return true if NDC value set.
*/
static bool peek(std::wstring& dst);
/**
* Appends the current NDC content to the provided string and removes the value from the NDC.
* @param dst destination.
- * @return true if NDC value set.
+ * @return true if NDC value set.
*/
static bool pop(std::wstring& dst);
#endif
@@ -273,7 +273,7 @@ namespace log4cxx
Creates a nested diagnostic context.
Since java performs no automatic cleanup of objects when a
scope is left, in log4j push() and pop() must be used
- to manage the NDC. For convenience, log4cxx provides
+ to manage the NDC. For convenience, log4cxx provides
an NDC constructor and destructor which simply call the push() and
pop() methods, allowing for automatic cleanup when the current
scope ends.
@@ -292,13 +292,13 @@ namespace log4cxx
/**
* Appends the current NDC content to the provided string.
* @param dst destination.
- * @return true if NDC value set.
+ * @return true if NDC value set.
*/
static bool peek(std::basic_string<UniChar>& dst);
/**
* Appends the current NDC content to the provided string and removes the value from the NDC.
* @param dst destination.
- * @return true if NDC value set.
+ * @return true if NDC value set.
*/
static bool pop(std::basic_string<UniChar>& dst);
#endif
@@ -307,7 +307,7 @@ namespace log4cxx
Creates a nested diagnostic context.
Since java performs no automatic cleanup of objects when a
scope is left, in log4j push() and pop() must be used
- to manage the NDC. For convenience, log4cxx provides
+ to manage the NDC. For convenience, log4cxx provides
an NDC constructor and destructor which simply call the push() and
pop() methods, allowing for automatic cleanup when the current
scope ends.
@@ -326,17 +326,17 @@ namespace log4cxx
/**
* Gets the current NDC value.
* @param dst destination.
- * @return true if NDC value set.
+ * @return true if NDC value set.
*/
static bool peek(CFStringRef& dst);
/**
* Gets and removes the current NDC value.
* @param dst destination.
- * @return true if NDC value set.
+ * @return true if NDC value set.
*/
static bool pop(CFStringRef& dst);
#endif
-
+
private:
NDC(const NDC&);
NDC& operator=(const NDC&);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/net/smtpappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/net/smtpappender.h b/src/main/include/log4cxx/net/smtpappender.h
index eb1dbb5..adac446 100644
--- a/src/main/include/log4cxx/net/smtpappender.h
+++ b/src/main/include/log4cxx/net/smtpappender.h
@@ -241,17 +241,17 @@ namespace log4cxx
inline int getBufferSize() const
{ return bufferSize; }
-
+
/**
* Gets the current triggering evaluator.
* @return triggering evaluator.
- */
+ */
log4cxx::spi::TriggeringEventEvaluatorPtr getEvaluator() const;
/**
* Sets the triggering evaluator.
* @param trigger triggering evaluator.
- */
+ */
void setEvaluator(log4cxx::spi::TriggeringEventEvaluatorPtr& trigger);
/**
@@ -262,7 +262,7 @@ namespace log4cxx
for the SMTPAppender.
*/
void setEvaluatorClass(const LogString& value);
-
+
/**
The <b>LocationInfo</b> option is provided for compatibility with log4j
and has no effect in log4cxx.
@@ -274,8 +274,8 @@ namespace log4cxx
*/
bool getLocationInfo() const;
}; // class SMTPAppender
-
- LOG4CXX_PTR_DEF(SMTPAppender);
+
+ LOG4CXX_PTR_DEF(SMTPAppender);
} // namespace net
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/net/socketappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/net/socketappender.h b/src/main/include/log4cxx/net/socketappender.h
index b32ade6..185fa05 100644
--- a/src/main/include/log4cxx/net/socketappender.h
+++ b/src/main/include/log4cxx/net/socketappender.h
@@ -120,11 +120,11 @@ namespace log4cxx
protected:
virtual void setSocket(log4cxx::helpers::SocketPtr& socket, log4cxx::helpers::Pool& p);
-
+
virtual void cleanUp(log4cxx::helpers::Pool& p);
-
+
virtual int getDefaultDelay() const;
-
+
virtual int getDefaultPort() const;
void append(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& pool);
@@ -133,9 +133,9 @@ namespace log4cxx
log4cxx::helpers::ObjectOutputStreamPtr oos;
}; // class SocketAppender
-
+
LOG4CXX_PTR_DEF(SocketAppender);
-
+
} // namespace net
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/net/socketappenderskeleton.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/net/socketappenderskeleton.h b/src/main/include/log4cxx/net/socketappenderskeleton.h
index 3dcb8a9..991d019 100755
--- a/src/main/include/log4cxx/net/socketappenderskeleton.h
+++ b/src/main/include/log4cxx/net/socketappenderskeleton.h
@@ -67,7 +67,7 @@ namespace log4cxx
Connect to the specified <b>RemoteHost</b> and <b>Port</b>.
*/
void activateOptions(log4cxx::helpers::Pool& p);
-
+
void close();
@@ -147,11 +147,11 @@ namespace log4cxx
protected:
virtual void setSocket(log4cxx::helpers::SocketPtr& socket, log4cxx::helpers::Pool& p) = 0;
-
+
virtual void cleanUp(log4cxx::helpers::Pool& p) = 0;
-
+
virtual int getDefaultDelay() const = 0;
-
+
virtual int getDefaultPort() const = 0;
private:
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/net/telnetappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/net/telnetappender.h b/src/main/include/log4cxx/net/telnetappender.h
index 5cbe2b0..d496588 100644
--- a/src/main/include/log4cxx/net/telnetappender.h
+++ b/src/main/include/log4cxx/net/telnetappender.h
@@ -88,10 +88,10 @@ servlet.
attached client(s). */
virtual bool requiresLayout() const
{ return true; }
-
+
LogString getEncoding() const;
void setEncoding(const LogString& value);
-
+
/** all of the options have been set, create the socket handler and
wait for connections. */
@@ -133,7 +133,7 @@ servlet.
typedef log4cxx::helpers::SocketPtr Connection;
LOG4CXX_LIST_DEF(ConnectionList, Connection);
-
+
void write(log4cxx::helpers::ByteBuffer&);
void writeStatus(const log4cxx::helpers::SocketPtr& socket, const LogString& msg, log4cxx::helpers::Pool& p);
ConnectionList connections;
@@ -144,7 +144,7 @@ servlet.
size_t activeConnections;
static void* LOG4CXX_THREAD_FUNC acceptConnections(apr_thread_t* thread, void* data);
}; // class TelnetAppender
-
+
LOG4CXX_PTR_DEF(TelnetAppender);
} // namespace net
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/net/xmlsocketappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/net/xmlsocketappender.h b/src/main/include/log4cxx/net/xmlsocketappender.h
index d99940f..66700e6 100644
--- a/src/main/include/log4cxx/net/xmlsocketappender.h
+++ b/src/main/include/log4cxx/net/xmlsocketappender.h
@@ -125,11 +125,11 @@ namespace log4cxx
protected:
virtual void setSocket(log4cxx::helpers::SocketPtr& socket, log4cxx::helpers::Pool& p);
-
+
virtual void cleanUp(log4cxx::helpers::Pool& p);
-
+
virtual int getDefaultDelay() const;
-
+
virtual int getDefaultPort() const;
void append(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& pool);
@@ -140,9 +140,9 @@ namespace log4cxx
XMLSocketAppender(const XMLSocketAppender&);
XMLSocketAppender& operator=(const XMLSocketAppender&);
}; // class XMLSocketAppender
-
+
LOG4CXX_PTR_DEF(XMLSocketAppender);
-
+
} // namespace net
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/classnamepatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/classnamepatternconverter.h b/src/main/include/log4cxx/pattern/classnamepatternconverter.h
index dd750b8..1123ec0 100644
--- a/src/main/include/log4cxx/pattern/classnamepatternconverter.h
+++ b/src/main/include/log4cxx/pattern/classnamepatternconverter.h
@@ -28,8 +28,8 @@ namespace log4cxx {
/**
* Formats the class name of the site of the logging request.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT ClassNamePatternConverter : public NamePatternConverter {
/**