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:10 UTC
[1/3] logging-log4cxx git commit: LOGCXX-500: Remove unnecessary
whitespace for easier applying of patches.
Repository: logging-log4cxx
Updated Branches:
refs/heads/master 5f8251869 -> fb126e744
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/stream.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/stream.h b/src/main/include/log4cxx/stream.h
index 8edec0d..915a310 100644
--- a/src/main/include/log4cxx/stream.h
+++ b/src/main/include/log4cxx/stream.h
@@ -31,7 +31,7 @@ namespace log4cxx
* unnecessary operations.
*
* The logstream has a logger and level that are used for logging
- * requests. The level of the stream is compared against the
+ * requests. The level of the stream is compared against the
* current level of the logger to determine if the request should be processed.
*/
class LOG4CXX_EXPORT logstream_base {
@@ -79,7 +79,7 @@ namespace log4cxx
* Set fill character.
*/
int fill(int newval);
-
+
/**
* Set flags. see std::ios_base.
*/
@@ -92,8 +92,8 @@ namespace log4cxx
* Set flags. see std::ios_base.
*/
std::ios_base::fmtflags setf(std::ios_base::fmtflags newflags);
-
-
+
+
/**
* end of message manipulator, triggers logging.
*/
@@ -103,21 +103,21 @@ namespace log4cxx
* no-operation manipulator, Used to avoid ambiguity with VC6.
*/
static logstream_base& nop(logstream_base&);
-
+
/**
* end of message action.
*/
void end_message();
-
+
/**
* Set the level.
* @param level level
*/
void setLevel(const LevelPtr& level);
/**
- * Returns true if the current level is the same or high as the
+ * Returns true if the current level is the same or high as the
* level of logger at time of construction or last setLevel.
*/
inline bool isEnabled() const {
@@ -139,7 +139,7 @@ namespace log4cxx
* to the state of the formatting info.
* @param os stream to receive formatting info.
* @param fillchar receives fill charater.
- * @return true if fill character was specified.
+ * @return true if fill character was specified.
*/
bool set_stream_state(std::ios_base& os, int& fillchar);
@@ -164,7 +164,7 @@ namespace log4cxx
int& fill,
bool& fillSet) const = 0;
virtual void refresh_stream_state() = 0;
-
+
private:
/**
* prevent copy constructor.
@@ -180,7 +180,7 @@ namespace log4cxx
*/
class LOG4CXX_EXPORT logstream_ios_base : public std::ios_base {
public:
- logstream_ios_base(std::ios_base::fmtflags initval,
+ logstream_ios_base(std::ios_base::fmtflags initval,
int initsize);
} initset, initclear;
/**
@@ -208,16 +208,16 @@ namespace log4cxx
*/
log4cxx::spi::LocationInfo location;
};
-
+
typedef logstream_base& (*logstream_manipulator)(logstream_base&);
-
+
/**
* An STL-like stream API for log4cxx using char as the character type.
*. Instances of log4cxx::logstream
* are not designedfor use by multiple threads and in general should be short-lived
- * function scoped objects. Using log4cxx::basic_logstream as a class member or
+ * function scoped objects. Using log4cxx::basic_logstream as a class member or
* static instance should be avoided in the same manner as you would avoid placing a std::ostringstream
- * in those locations. Insertion operations are generally short-circuited if the
+ * in those locations. Insertion operations are generally short-circuited if the
* level for the stream is not the same of higher that the level of the associated logger.
*/
class LOG4CXX_EXPORT logstream : public logstream_base {
@@ -228,31 +228,31 @@ namespace log4cxx
*/
logstream(const log4cxx::LoggerPtr& logger,
const log4cxx::LevelPtr& level);
-
+
/**
* Constructor.
*/
- logstream(const Ch* loggerName,
+ logstream(const Ch* loggerName,
const log4cxx::LevelPtr& level);
/**
* Constructor.
*/
- logstream(const std::basic_string<Ch>& loggerName,
+ logstream(const std::basic_string<Ch>& loggerName,
const log4cxx::LevelPtr& level);
-
+
~logstream();
-
+
/**
* Insertion operator for std::fixed and similar manipulators.
*/
logstream& operator<<(std::ios_base& (*manip)(std::ios_base&));
-
+
/**
* Insertion operator for logstream_base::endmsg.
*/
logstream& operator<<(logstream_manipulator manip);
-
+
/**
* Insertion operator for level.
*/
@@ -261,7 +261,7 @@ namespace log4cxx
* Insertion operator for location.
*/
logstream& operator<<(const log4cxx::spi::LocationInfo& location);
-
+
/**
* Alias for insertion operator for location. Kludge to avoid
* inappropriate compiler ambiguity.
@@ -273,7 +273,7 @@ namespace log4cxx
*/
operator std::basic_ostream<Ch>&();
-#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE)
+#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE)
/**
* Template to allow any class with an std::basic_ostream inserter
* to be applied to this class.
@@ -285,38 +285,38 @@ namespace log4cxx
}
return *this;
}
-#endif
-
-
+#endif
+
+
protected:
virtual void log(LoggerPtr& logger,
const LevelPtr& level,
const log4cxx::spi::LocationInfo& location);
-
+
virtual void erase();
-
+
virtual void get_stream_state(std::ios_base& base,
std::ios_base& mask,
int& fill,
bool& fillSet) const;
virtual void refresh_stream_state();
-
-
+
+
private:
logstream(const logstream&);
- logstream& operator=(const logstream&);
+ logstream& operator=(const logstream&);
std::basic_stringstream<Ch>* stream;
-
+
};
-
-#if LOG4CXX_WCHAR_T_API
+
+#if LOG4CXX_WCHAR_T_API
/**
* An STL-like stream API for log4cxx using wchar_t as the character type.
*. Instances of log4cxx::logstream
* are not designedfor use by multiple threads and in general should be short-lived
- * function scoped objects. Using log4cxx::basic_logstream as a class member or
+ * function scoped objects. Using log4cxx::basic_logstream as a class member or
* static instance should be avoided in the same manner as you would avoid placing a std::ostringstream
- * in those locations. Insertion operations are generally short-circuited if the
+ * in those locations. Insertion operations are generally short-circuited if the
* level for the stream is not the same of higher that the level of the associated logger.
*/
class LOG4CXX_EXPORT wlogstream : public logstream_base {
@@ -327,31 +327,31 @@ namespace log4cxx
*/
wlogstream(const log4cxx::LoggerPtr& logger,
const log4cxx::LevelPtr& level);
-
+
/**
* Constructor.
*/
- wlogstream(const Ch* loggerName,
+ wlogstream(const Ch* loggerName,
const log4cxx::LevelPtr& level);
/**
* Constructor.
*/
- wlogstream(const std::basic_string<Ch>& loggerName,
+ wlogstream(const std::basic_string<Ch>& loggerName,
const log4cxx::LevelPtr& level);
-
+
~wlogstream();
-
+
/**
* Insertion operator for std::fixed and similar manipulators.
*/
wlogstream& operator<<(std::ios_base& (*manip)(std::ios_base&));
-
+
/**
* Insertion operator for logstream_base::endmsg.
*/
wlogstream& operator<<(logstream_manipulator manip);
-
+
/**
* Insertion operator for level.
*/
@@ -360,20 +360,20 @@ namespace log4cxx
* Insertion operator for location.
*/
wlogstream& operator<<(const log4cxx::spi::LocationInfo& location);
-
+
/**
* Alias for insertion operator for location. Kludge to avoid
* inappropriate compiler ambiguity.
*/
wlogstream& operator>>(const log4cxx::spi::LocationInfo& location);
-
+
/**
* Cast operator to provide access to embedded std::basic_ostream.
*/
operator std::basic_ostream<Ch>&();
-
-#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE)
+
+#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE)
/**
* Template to allow any class with an std::basic_ostream inserter
* to be applied to this class.
@@ -385,38 +385,38 @@ namespace log4cxx
}
return *this;
}
-#endif
-
+#endif
+
protected:
virtual void log(LoggerPtr& logger,
const LevelPtr& level,
const log4cxx::spi::LocationInfo& location);
-
+
virtual void erase();
-
+
virtual void get_stream_state(std::ios_base& base,
std::ios_base& mask,
int& fill,
bool& fillSet) const;
virtual void refresh_stream_state();
-
-
+
+
private:
wlogstream(const wlogstream&);
wlogstream& operator=(const wlogstream&);
std::basic_stringstream<Ch>* stream;
-
+
};
#endif
-#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
+#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
/**
* An STL-like stream API for log4cxx using UniChar as the character type.
*. Instances of log4cxx::logstream
* are not designedfor use by multiple threads and in general should be short-lived
- * function scoped objects. Using log4cxx::basic_logstream as a class member or
+ * function scoped objects. Using log4cxx::basic_logstream as a class member or
* static instance should be avoided in the same manner as you would avoid placing a std::ostringstream
- * in those locations. Insertion operations are generally short-circuited if the
+ * in those locations. Insertion operations are generally short-circuited if the
* level for the stream is not the same of higher that the level of the associated logger.
*/
class LOG4CXX_EXPORT ulogstream : public logstream_base {
@@ -427,38 +427,38 @@ namespace log4cxx
*/
ulogstream(const log4cxx::LoggerPtr& logger,
const log4cxx::LevelPtr& level);
-
-#if LOG4CXX_UNICHAR_API
+
+#if LOG4CXX_UNICHAR_API
/**
* Constructor.
*/
- ulogstream(const Ch* loggerName,
+ ulogstream(const Ch* loggerName,
const log4cxx::LevelPtr& level);
/**
* Constructor.
*/
- ulogstream(const std::basic_string<Ch>& loggerName,
+ ulogstream(const std::basic_string<Ch>& loggerName,
const log4cxx::LevelPtr& level);
#endif
#if LOG4CXX_CFSTRING_API
ulogstream(const CFStringRef& loggerName,
const log4cxx::LevelPtr& level);
-#endif
-
+#endif
+
~ulogstream();
-
+
/**
* Insertion operator for std::fixed and similar manipulators.
*/
ulogstream& operator<<(std::ios_base& (*manip)(std::ios_base&));
-
+
/**
* Insertion operator for logstream_base::endmsg.
*/
ulogstream& operator<<(logstream_manipulator manip);
-
+
/**
* Insertion operator for level.
*/
@@ -467,20 +467,20 @@ namespace log4cxx
* Insertion operator for location.
*/
ulogstream& operator<<(const log4cxx::spi::LocationInfo& location);
-
+
/**
* Alias for insertion operator for location. Kludge to avoid
* inappropriate compiler ambiguity.
*/
ulogstream& operator>>(const log4cxx::spi::LocationInfo& location);
-
+
/**
* Cast operator to provide access to embedded std::basic_ostream.
*/
operator std::basic_ostream<Ch>&();
-
-#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE)
+
+#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE)
/**
* Template to allow any class with an std::basic_ostream inserter
* to be applied to this class.
@@ -492,27 +492,27 @@ namespace log4cxx
}
return *this;
}
-#endif
-
+#endif
+
protected:
virtual void log(LoggerPtr& logger,
const LevelPtr& level,
const log4cxx::spi::LocationInfo& location);
-
+
virtual void erase();
-
+
virtual void get_stream_state(std::ios_base& base,
std::ios_base& mask,
int& fill,
bool& fillSet) const;
virtual void refresh_stream_state();
-
-
+
+
private:
ulogstream(const ulogstream&);
ulogstream& operator=(const ulogstream&);
std::basic_stringstream<Ch>* stream;
-
+
};
#endif
@@ -524,7 +524,7 @@ namespace log4cxx
//
// VC6 will fail to compile if class-scope templates
// are used to handle arbitrary insertion operations.
-// However, using global namespace insertion operations
+// However, using global namespace insertion operations
// run into LOGCXX-150.
/**
@@ -539,7 +539,7 @@ inline log4cxx::logstream& operator<<(log4cxx::logstream& os, const V& val) {
return os;
}
-#if LOG4CXX_WCHAR_T_API
+#if LOG4CXX_WCHAR_T_API
/**
* Template to allow any class with an std::basic_ostream inserter
* to be applied to this class.
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/varia/fallbackerrorhandler.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/varia/fallbackerrorhandler.h b/src/main/include/log4cxx/varia/fallbackerrorhandler.h
index 9b21350..af031d2 100644
--- a/src/main/include/log4cxx/varia/fallbackerrorhandler.h
+++ b/src/main/include/log4cxx/varia/fallbackerrorhandler.h
@@ -110,7 +110,7 @@ namespace log4cxx
void setBackupAppender(const AppenderPtr& backup);
};
LOG4CXX_PTR_DEF(FallbackErrorHandler);
-
+
} // namespace varia
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/writerappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/writerappender.h b/src/main/include/log4cxx/writerappender.h
index 41a0486..83db326 100644
--- a/src/main/include/log4cxx/writerappender.h
+++ b/src/main/include/log4cxx/writerappender.h
@@ -179,7 +179,7 @@ namespace log4cxx
<p>
@param writer An already opened Writer. */
void setWriter(const log4cxx::helpers::WriterPtr& writer);
-#ifdef LOG4CXX_MULTI_PROCESS
+#ifdef LOG4CXX_MULTI_PROCESS
const log4cxx::helpers::WriterPtr getWriter() { return writer; };
#endif
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/xml/domconfigurator.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/xml/domconfigurator.h b/src/main/include/log4cxx/xml/domconfigurator.h
index 93efec1..e157a4e 100644
--- a/src/main/include/log4cxx/xml/domconfigurator.h
+++ b/src/main/include/log4cxx/xml/domconfigurator.h
@@ -109,7 +109,7 @@ namespace log4cxx
void parseErrorHandler(
log4cxx::helpers::Pool& p,
log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
- apr_xml_elem* element,
+ apr_xml_elem* element,
AppenderPtr& appender,
apr_xml_doc* doc,
AppenderMap& appenders);
@@ -160,7 +160,7 @@ namespace log4cxx
/**
Used internally to parse the root logger element.
*/
- void parseRoot(log4cxx::helpers::Pool& p,
+ void parseRoot(log4cxx::helpers::Pool& p,
log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
apr_xml_elem* rootElement, apr_xml_doc* doc, AppenderMap& appenders);
@@ -205,7 +205,7 @@ namespace log4cxx
void parse(
log4cxx::helpers::Pool& p,
log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
- apr_xml_elem* element,
+ apr_xml_elem* element,
apr_xml_doc* doc,
AppenderMap& appenders);
@@ -290,7 +290,7 @@ namespace log4cxx
protected:
static LogString getAttribute(
log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
- apr_xml_elem*,
+ apr_xml_elem*,
const std::string& attrName);
LogString subst(const LogString& value);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/xml/xmllayout.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/xml/xmllayout.h b/src/main/include/log4cxx/xml/xmllayout.h
index a0094ac..fba0ad3 100644
--- a/src/main/include/log4cxx/xml/xmllayout.h
+++ b/src/main/include/log4cxx/xml/xmllayout.h
@@ -86,11 +86,11 @@ namespace log4cxx
*/
inline bool getLocationInfo() const
{ return locationInfo; }
-
+
/**
* Sets whether MDC key-value pairs should be output, default false.
* @param flag new value.
- *
+ *
*/
inline void setProperties(bool flag) {
properties = flag;
@@ -99,12 +99,12 @@ namespace log4cxx
/**
* Gets whether MDC key-value pairs should be output.
* @return true if MDC key-value pairs are output.
- *
+ *
*/
inline bool getProperties() {
return properties;
}
-
+
/** No options to activate. */
void activateOptions(log4cxx::helpers::Pool& /* p */) { }
[2/3] logging-log4cxx git commit: LOGCXX-500: Remove unnecessary
whitespace for easier applying of patches.
Posted by ts...@apache.org.
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/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/fb126e74/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/fb126e74/src/main/include/log4cxx/helpers/aprinitializer.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/aprinitializer.h b/src/main/include/log4cxx/helpers/aprinitializer.h
index 2d64e99..1a91a7a 100644
--- a/src/main/include/log4cxx/helpers/aprinitializer.h
+++ b/src/main/include/log4cxx/helpers/aprinitializer.h
@@ -36,7 +36,7 @@ namespace log4cxx
namespace helpers
{
class FileWatchdog;
-
+
class APRInitializer
{
public:
@@ -44,10 +44,10 @@ namespace log4cxx
static apr_pool_t* getRootPool();
static apr_threadkey_t* getTlsKey();
static bool isDestructed;
-
+
/**
* Register a FileWatchdog for deletion prior to
- * APR termination. FileWatchdog must be
+ * APR termination. FileWatchdog must be
* allocated on heap and not deleted elsewhere.
*/
static void registerCleanup(FileWatchdog* watchdog);
@@ -59,7 +59,7 @@ namespace log4cxx
APRInitializer& operator=(const APRInitializer&);
apr_pool_t* p;
apr_thread_mutex_t* mutex;
- std::list<FileWatchdog*> watchdogs;
+ std::list<FileWatchdog*> watchdogs;
apr_time_t startTime;
apr_threadkey_t* tlsKey;
static APRInitializer& getInstance();
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/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 11d33de..3596925 100644
--- 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/fb126e74/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/fb126e74/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 100644
--- 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/fb126e74/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/fb126e74/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/fb126e74/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/fb126e74/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 d66e4aa..86ab41e 100644
--- a/src/main/include/log4cxx/helpers/fileoutputstream.h
+++ b/src/main/include/log4cxx/helpers/fileoutputstream.h
@@ -58,7 +58,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/fb126e74/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/fb126e74/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/fb126e74/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/fb126e74/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/fb126e74/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/fb126e74/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/fb126e74/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/fb126e74/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 dc18fcb..42a930f 100644
--- a/src/main/include/log4cxx/helpers/simpledateformat.h
+++ b/src/main/include/log4cxx/helpers/simpledateformat.h
@@ -81,7 +81,7 @@ namespace log4cxx
* List of tokens.
*/
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/fb126e74/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/fb126e74/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 0c6fbb4..94d9895 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/fb126e74/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/fb126e74/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 ca5f44b..880e07d 100644
--- a/src/main/include/log4cxx/helpers/thread.h
+++ b/src/main/include/log4cxx/helpers/thread.h
@@ -83,11 +83,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();
/**
@@ -95,11 +95,11 @@ namespace log4cxx
* sets the interrupted status to false.
*/
static bool interrupted();
-
+
bool isAlive();
bool isCurrentThread() const;
void ending();
-
+
private:
Pool p;
@@ -110,7 +110,7 @@ namespace log4cxx
apr_thread_cond_t* interruptedCondition;
Thread(const Thread&);
Thread& operator=(const Thread&);
- friend void* LOG4CXX_THREAD_FUNC ThreadLaunch::launcher(apr_thread_t* thread, void* data);
+ friend void* LOG4CXX_THREAD_FUNC ThreadLaunch::launcher(apr_thread_t* thread, void* data);
};
} // namespace helpers
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/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/fb126e74/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/fb126e74/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/fb126e74/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/fb126e74/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/fb126e74/src/main/include/log4cxx/logstring.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/logstring.h b/src/main/include/log4cxx/logstring.h
index 19e8aec..297b76d 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/fb126e74/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/fb126e74/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/fb126e74/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 fd0bfa7..0f6a896 100644
--- 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/fb126e74/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 861728c..fbc00e0 100644
--- a/src/main/include/log4cxx/net/telnetappender.h
+++ b/src/main/include/log4cxx/net/telnetappender.h
@@ -91,10 +91,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. */
@@ -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/fb126e74/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 6ce1af7..8c3b2f2 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 {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/datepatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/datepatternconverter.h b/src/main/include/log4cxx/pattern/datepatternconverter.h
index cdaef42..978ee8e 100644
--- a/src/main/include/log4cxx/pattern/datepatternconverter.h
+++ b/src/main/include/log4cxx/pattern/datepatternconverter.h
@@ -30,8 +30,8 @@ namespace log4cxx {
/**
* Convert and format the event's date in a StringBuffer.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT DatePatternConverter : public LoggingEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/filedatepatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/filedatepatternconverter.h b/src/main/include/log4cxx/pattern/filedatepatternconverter.h
index 9e15239..30893ec 100644
--- a/src/main/include/log4cxx/pattern/filedatepatternconverter.h
+++ b/src/main/include/log4cxx/pattern/filedatepatternconverter.h
@@ -28,8 +28,8 @@ namespace log4cxx { namespace pattern {
* date pattern for a %d specifier in a file name is different than
* the %d pattern in pattern layout.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT FileDatePatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/filelocationpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/filelocationpatternconverter.h b/src/main/include/log4cxx/pattern/filelocationpatternconverter.h
index 0d54de2..b2d14d6 100644
--- a/src/main/include/log4cxx/pattern/filelocationpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/filelocationpatternconverter.h
@@ -27,8 +27,8 @@ namespace log4cxx {
/**
* Return the event's line location information in a StringBuffer.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT FileLocationPatternConverter
: public LoggingEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/formattinginfo.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/formattinginfo.h b/src/main/include/log4cxx/pattern/formattinginfo.h
index c3eac5a..8b1ab1d 100644
--- a/src/main/include/log4cxx/pattern/formattinginfo.h
+++ b/src/main/include/log4cxx/pattern/formattinginfo.h
@@ -34,9 +34,9 @@ typedef helpers::ObjectPtrT<FormattingInfo> FormattingInfoPtr;
* Modifies the output of a pattern converter for a specified minimum
* and maximum width and alignment.
*
- *
*
- *
+ *
+ *
*/
class LOG4CXX_EXPORT FormattingInfo : public virtual log4cxx::helpers::ObjectImpl {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/fulllocationpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/fulllocationpatternconverter.h b/src/main/include/log4cxx/pattern/fulllocationpatternconverter.h
index c08d435..1b54fa9 100644
--- a/src/main/include/log4cxx/pattern/fulllocationpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/fulllocationpatternconverter.h
@@ -27,8 +27,8 @@ namespace pattern {
/**
* Format the event's line location information.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT FullLocationPatternConverter
: public LoggingEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/integerpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/integerpatternconverter.h b/src/main/include/log4cxx/pattern/integerpatternconverter.h
index 0667809..c552632 100644
--- a/src/main/include/log4cxx/pattern/integerpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/integerpatternconverter.h
@@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern {
/**
* Formats an integer.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT IntegerPatternConverter : public PatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/levelpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/levelpatternconverter.h b/src/main/include/log4cxx/pattern/levelpatternconverter.h
index 5a9cbe9..5ff198d 100644
--- a/src/main/include/log4cxx/pattern/levelpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/levelpatternconverter.h
@@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern {
/**
* Return the event's level in a StringBuffer.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT LevelPatternConverter : public LoggingEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/linelocationpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/linelocationpatternconverter.h b/src/main/include/log4cxx/pattern/linelocationpatternconverter.h
index f1cbfe4..adacfdc 100644
--- a/src/main/include/log4cxx/pattern/linelocationpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/linelocationpatternconverter.h
@@ -27,8 +27,8 @@ namespace pattern {
/**
* Format the event's line location information.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT LineLocationPatternConverter
: public LoggingEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/lineseparatorpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/lineseparatorpatternconverter.h b/src/main/include/log4cxx/pattern/lineseparatorpatternconverter.h
index 9781e5b..85f5633 100644
--- a/src/main/include/log4cxx/pattern/lineseparatorpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/lineseparatorpatternconverter.h
@@ -27,8 +27,8 @@ namespace pattern {
/**
* Formats a line separator.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT LineSeparatorPatternConverter
: public LoggingEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/literalpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/literalpatternconverter.h b/src/main/include/log4cxx/pattern/literalpatternconverter.h
index 5d24434..3717f43 100644
--- a/src/main/include/log4cxx/pattern/literalpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/literalpatternconverter.h
@@ -26,8 +26,8 @@ namespace log4cxx {
/**
* Formats a string literal.
*
- *
- *
+ *
+ *
*
*/
class LOG4CXX_EXPORT LiteralPatternConverter : public LoggingEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/loggerpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/loggerpatternconverter.h b/src/main/include/log4cxx/pattern/loggerpatternconverter.h
index d707fd1..76b8561 100644
--- a/src/main/include/log4cxx/pattern/loggerpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/loggerpatternconverter.h
@@ -27,9 +27,9 @@ namespace log4cxx {
/**
* Formats a logger name.
*
- *
*
- *
+ *
+ *
*/
class LOG4CXX_EXPORT LoggerPatternConverter : public NamePatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h b/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h
index 7118808..048366c 100644
--- a/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h
@@ -28,9 +28,9 @@ namespace log4cxx {
* LoggingEventPatternConverter is a base class for pattern converters
* that can format information from instances of LoggingEvent.
*
- *
*
- *
+ *
+ *
*/
class LOG4CXX_EXPORT LoggingEventPatternConverter : public PatternConverter {
protected:
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/messagepatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/messagepatternconverter.h b/src/main/include/log4cxx/pattern/messagepatternconverter.h
index 14a9fe2..4bb86ef 100644
--- a/src/main/include/log4cxx/pattern/messagepatternconverter.h
+++ b/src/main/include/log4cxx/pattern/messagepatternconverter.h
@@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern {
/**
* Formats the message of an logging event.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT MessagePatternConverter : public LoggingEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/methodlocationpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/methodlocationpatternconverter.h b/src/main/include/log4cxx/pattern/methodlocationpatternconverter.h
index 818af2c..8cbc6b1 100644
--- a/src/main/include/log4cxx/pattern/methodlocationpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/methodlocationpatternconverter.h
@@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern {
/**
* Return the event's line location information in a StringBuffer.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT MethodLocationPatternConverter
: public LoggingEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/nameabbreviator.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/nameabbreviator.h b/src/main/include/log4cxx/pattern/nameabbreviator.h
index 8eedaab..092ee12 100644
--- a/src/main/include/log4cxx/pattern/nameabbreviator.h
+++ b/src/main/include/log4cxx/pattern/nameabbreviator.h
@@ -31,8 +31,8 @@ namespace log4cxx {
/**
* NameAbbreviator generates abbreviated logger and class names.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT NameAbbreviator : public log4cxx::helpers::ObjectImpl {
public:
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/ndcpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/ndcpatternconverter.h b/src/main/include/log4cxx/pattern/ndcpatternconverter.h
index fd49dce..ce026fd 100644
--- a/src/main/include/log4cxx/pattern/ndcpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/ndcpatternconverter.h
@@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern {
/**
* Return the event's NDC in a StringBuffer.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT NDCPatternConverter : public LoggingEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/patternparser.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/patternparser.h b/src/main/include/log4cxx/pattern/patternparser.h
index 2a5113a..eab174b 100644
--- a/src/main/include/log4cxx/pattern/patternparser.h
+++ b/src/main/include/log4cxx/pattern/patternparser.h
@@ -49,7 +49,7 @@ typedef std::map<LogString, PatternConstructor> PatternMap;
* <p>It is this class that parses conversion patterns and creates
* a chained list of {@link PatternConverter PatternConverters}.
*
- *
+ *
*/
class LOG4CXX_EXPORT PatternParser {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/propertiespatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/propertiespatternconverter.h b/src/main/include/log4cxx/pattern/propertiespatternconverter.h
index 9e59a1a..9dcad0c 100644
--- a/src/main/include/log4cxx/pattern/propertiespatternconverter.h
+++ b/src/main/include/log4cxx/pattern/propertiespatternconverter.h
@@ -30,8 +30,8 @@ namespace log4cxx { namespace pattern {
* within the property bundle
* when this pattern converter has the option set.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT PropertiesPatternConverter
: public LoggingEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/relativetimepatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/relativetimepatternconverter.h b/src/main/include/log4cxx/pattern/relativetimepatternconverter.h
index 385fc41..708fe8f 100644
--- a/src/main/include/log4cxx/pattern/relativetimepatternconverter.h
+++ b/src/main/include/log4cxx/pattern/relativetimepatternconverter.h
@@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern {
/**
* Format the relative time in milliseconds.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT RelativeTimePatternConverter : public LoggingEventPatternConverter {
public:
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/threadpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/threadpatternconverter.h b/src/main/include/log4cxx/pattern/threadpatternconverter.h
index f9216b9..178f652 100644
--- a/src/main/include/log4cxx/pattern/threadpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/threadpatternconverter.h
@@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern {
/**
* Formats the event thread name.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT ThreadPatternConverter : public LoggingEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h b/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h
index cd4f415..e3a4805 100644
--- a/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h
+++ b/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h
@@ -27,8 +27,8 @@ namespace log4cxx { namespace pattern {
* Outputs the ThrowableInformation portion of the LoggingiEvent as a full stacktrace
* unless this converter's option is 'short', where it just outputs the first line of the trace.
*
- *
- *
+ *
+ *
*
*/
class LOG4CXX_EXPORT ThrowableInformationPatternConverter
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/propertyconfigurator.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/propertyconfigurator.h b/src/main/include/log4cxx/propertyconfigurator.h
index a45bfa6..e9706ff 100644
--- a/src/main/include/log4cxx/propertyconfigurator.h
+++ b/src/main/include/log4cxx/propertyconfigurator.h
@@ -381,7 +381,7 @@ protected:
void registryPut(const AppenderPtr& appender);
AppenderPtr registryGet(const LogString& name);
-
+
private:
PropertyConfigurator(const PropertyConfigurator&);
PropertyConfigurator& operator=(const PropertyConfigurator&);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/provisionnode.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/provisionnode.h b/src/main/include/log4cxx/provisionnode.h
index 5d1c31f..c6ec36f 100644
--- a/src/main/include/log4cxx/provisionnode.h
+++ b/src/main/include/log4cxx/provisionnode.h
@@ -5,16 +5,16 @@
* 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.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#ifndef _LOG4CXX_PROVISION_NODE_H
#define _LOG4CXX_PROVISION_NODE_H
@@ -27,7 +27,7 @@ namespace log4cxx
class Logger;
typedef helpers::ObjectPtrT<Logger> LoggerPtr;
-
+
typedef std::vector<LoggerPtr> ProvisionNode;
} // namespace log4cxx
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h b/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h
index efe5825..310edd6 100644
--- a/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h
+++ b/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h
@@ -38,8 +38,8 @@
* by evaluating the current message against a set of filters. Unless a
* filter rejects a message, a rolling event will be triggered.
*
- *
- *
+ *
+ *
*
*/
class LOG4CXX_EXPORT FilterBasedTriggeringPolicy : public TriggeringPolicy {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/rolling/manualtriggeringpolicy.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/rolling/manualtriggeringpolicy.h b/src/main/include/log4cxx/rolling/manualtriggeringpolicy.h
index 5461183..cb29794 100644
--- a/src/main/include/log4cxx/rolling/manualtriggeringpolicy.h
+++ b/src/main/include/log4cxx/rolling/manualtriggeringpolicy.h
@@ -34,7 +34,7 @@ namespace log4cxx {
* ManualTriggeringPolicy only rolls over on explicit calls to
* RollingFileAppender.rollover().
*
- *
+ *
*
*/
class LOG4CXX_EXPORT ManualTriggeringPolicy : public TriggeringPolicy {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/rolling/rollingfileappender.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/rolling/rollingfileappender.h b/src/main/include/log4cxx/rolling/rollingfileappender.h
index ec044fb..103e967 100644
--- a/src/main/include/log4cxx/rolling/rollingfileappender.h
+++ b/src/main/include/log4cxx/rolling/rollingfileappender.h
@@ -24,7 +24,7 @@
namespace log4cxx {
namespace rolling {
-
+
/**
* <code>RollingFileAppender</code> extends {@link log4cxx::FileAppender} to backup the log files
* depending on {@link log4cxx::rolling::RollingPolicy RollingPolicy} and {@link log4cxx::rolling::TriggeringPolicy TriggeringPolicy}.
@@ -66,9 +66,9 @@ namespace log4cxx {
* automatic compression of the archived files. See
* {@link TimeBasedRollingPolicy} for more details.
*
- *
- *
- *
+ *
+ *
+ *
* */
class LOG4CXX_EXPORT RollingFileAppender : public RollingFileAppenderSkeleton {
DECLARE_LOG4CXX_OBJECT(RollingFileAppender)
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/rolling/rollingfileappenderskeleton.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/rolling/rollingfileappenderskeleton.h b/src/main/include/log4cxx/rolling/rollingfileappenderskeleton.h
index 328fc38..40568c7 100644
--- a/src/main/include/log4cxx/rolling/rollingfileappenderskeleton.h
+++ b/src/main/include/log4cxx/rolling/rollingfileappenderskeleton.h
@@ -32,8 +32,8 @@ namespace log4cxx {
/**
* Base class for log4cxx::rolling::RollingFileAppender and log4cxx::RollingFileAppender
* (analogues of org.apache.log4j.rolling.RFA from extras companion and
- * org.apache.log4j.RFA from log4j 1.2, respectively).
- *
+ * org.apache.log4j.RFA from log4j 1.2, respectively).
+ *
* */
class LOG4CXX_EXPORT RollingFileAppenderSkeleton : public FileAppender {
DECLARE_LOG4CXX_OBJECT(RollingFileAppenderSkeleton)
@@ -137,7 +137,7 @@ namespace log4cxx {
* @return byte length of current active log file.
*/
size_t getFileLength() const;
-
+
#ifdef LOG4CXX_MULTI_PROCESS
/**
* Set byte length of current active log file.
@@ -164,7 +164,7 @@ namespace log4cxx {
void incrementFileLength(size_t increment);
};
-
+
LOG4CXX_PTR_DEF(RollingFileAppenderSkeleton);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/rolling/rollingpolicybase.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/rolling/rollingpolicybase.h b/src/main/include/log4cxx/rolling/rollingpolicybase.h
index 50b69a6..4011a62 100644
--- a/src/main/include/log4cxx/rolling/rollingpolicybase.h
+++ b/src/main/include/log4cxx/rolling/rollingpolicybase.h
@@ -41,8 +41,8 @@ namespace log4cxx {
* Implements methods common to most, it not all, rolling
* policies.
*
- *
- *
+ *
+ *
*/
class LOG4CXX_EXPORT RollingPolicyBase :
public virtual RollingPolicy,
@@ -96,7 +96,7 @@ namespace log4cxx {
LogString getFileNamePattern() const;
-#ifdef LOG4CXX_MULTI_PROCESS
+#ifdef LOG4CXX_MULTI_PROCESS
PatternConverterList getPatternConverterList() { return patternConverters; }
#endif
protected:
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h b/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h
index 87ddffb..918d691 100644
--- a/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h
+++ b/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h
@@ -34,7 +34,7 @@ namespace log4cxx {
* SizeBasedTriggeringPolicy looks at size of the file being
* currently written to.
*
- *
+ *
*
*/
class LOG4CXX_EXPORT SizeBasedTriggeringPolicy : public TriggeringPolicy {
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/rolling/triggeringpolicy.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/rolling/triggeringpolicy.h b/src/main/include/log4cxx/rolling/triggeringpolicy.h
index 6a71632..7b53ef2 100644
--- a/src/main/include/log4cxx/rolling/triggeringpolicy.h
+++ b/src/main/include/log4cxx/rolling/triggeringpolicy.h
@@ -35,8 +35,8 @@ namespace log4cxx {
* occurs. Such conditions include time of day, file size, an
* external event or a combination thereof.
*
- *
- *
+ *
+ *
* */
class LOG4CXX_EXPORT TriggeringPolicy :
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/rolling/zipcompressaction.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/rolling/zipcompressaction.h b/src/main/include/log4cxx/rolling/zipcompressaction.h
index 66a19c6..559326b 100644
--- a/src/main/include/log4cxx/rolling/zipcompressaction.h
+++ b/src/main/include/log4cxx/rolling/zipcompressaction.h
@@ -62,7 +62,7 @@ namespace log4cxx {
};
LOG4CXX_PTR_DEF(ZipCompressAction);
-
+
}
#if defined(_MSC_VER)
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/spi/appenderattachable.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/spi/appenderattachable.h b/src/main/include/log4cxx/spi/appenderattachable.h
index 7fa06fa..bd49f0d 100644
--- a/src/main/include/log4cxx/spi/appenderattachable.h
+++ b/src/main/include/log4cxx/spi/appenderattachable.h
@@ -86,7 +86,7 @@ namespace log4cxx
LOG4CXX_PTR_DEF(AppenderAttachable);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/spi/errorhandler.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/spi/errorhandler.h b/src/main/include/log4cxx/spi/errorhandler.h
index 5bb363e..11faa90 100644
--- a/src/main/include/log4cxx/spi/errorhandler.h
+++ b/src/main/include/log4cxx/spi/errorhandler.h
@@ -69,7 +69,7 @@ namespace log4cxx
LOG4CXX_CAST_ENTRY(ErrorHandler)
LOG4CXX_CAST_ENTRY(OptionHandler)
END_LOG4CXX_CAST_MAP()
-
+
virtual ~ErrorHandler() {}
/**
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/spi/filter.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/spi/filter.h b/src/main/include/log4cxx/spi/filter.h
index 83c5dc7..80ce59b 100644
--- a/src/main/include/log4cxx/spi/filter.h
+++ b/src/main/include/log4cxx/spi/filter.h
@@ -87,7 +87,7 @@ namespace log4cxx
log4cxx::spi::FilterPtr getNext() const;
void setNext(const log4cxx::spi::FilterPtr& newNext);
-
+
enum FilterDecision
{
/**
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/spi/hierarchyeventlistener.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/spi/hierarchyeventlistener.h b/src/main/include/log4cxx/spi/hierarchyeventlistener.h
index 7112397..98e8f86 100644
--- a/src/main/include/log4cxx/spi/hierarchyeventlistener.h
+++ b/src/main/include/log4cxx/spi/hierarchyeventlistener.h
@@ -45,11 +45,11 @@ namespace log4cxx
virtual ~HierarchyEventListener() {}
virtual void addAppenderEvent(
- const log4cxx::helpers::ObjectPtrT<Logger>& logger,
+ const log4cxx::helpers::ObjectPtrT<Logger>& logger,
const log4cxx::helpers::ObjectPtrT<Appender>& appender) = 0;
virtual void removeAppenderEvent(
- const log4cxx::helpers::ObjectPtrT<Logger>& logger,
+ const log4cxx::helpers::ObjectPtrT<Logger>& logger,
const log4cxx::helpers::ObjectPtrT<Appender>& appender) = 0;
};
LOG4CXX_PTR_DEF(HierarchyEventListener);
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/spi/loggerfactory.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/spi/loggerfactory.h b/src/main/include/log4cxx/spi/loggerfactory.h
index 07f8be9..ff9be2f 100644
--- a/src/main/include/log4cxx/spi/loggerfactory.h
+++ b/src/main/include/log4cxx/spi/loggerfactory.h
@@ -35,7 +35,7 @@ namespace log4cxx
DECLARE_ABSTRACT_LOG4CXX_OBJECT(LoggerFactory)
virtual ~LoggerFactory() {}
virtual LoggerPtr makeNewLoggerInstance(
- log4cxx::helpers::Pool& pool,
+ log4cxx::helpers::Pool& pool,
const LogString& name) const = 0;
};
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fb126e74/src/main/include/log4cxx/spi/loggerrepository.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/spi/loggerrepository.h b/src/main/include/log4cxx/spi/loggerrepository.h
index 4fe7957..1949d17 100644
--- a/src/main/include/log4cxx/spi/loggerrepository.h
+++ b/src/main/include/log4cxx/spi/loggerrepository.h
@@ -33,7 +33,7 @@ namespace log4cxx
{
namespace spi
{
-
+
/**
A <code>LoggerRepository</code> is used to create and retrieve
<code>Loggers</code>. The relation between loggers in a repository
[3/3] logging-log4cxx git commit: LOGCXX-500: Remove unnecessary
whitespace for easier applying of patches.
Posted by ts...@apache.org.
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
{