Modified: logging/log4cxx/trunk/src/main/include/log4cxx/stream.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/stream.h?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/main/include/log4cxx/stream.h (original) +++ logging/log4cxx/trunk/src/main/include/log4cxx/stream.h Tue Feb 12 17:23:18 2008 @@ -209,11 +209,11 @@ log4cxx::spi::LocationInfo location; }; - typedef logstream_base& (*logstream_manipulator)(logstream_base&); + typedef logstream_base& (*logstream_manipulator)(logstream_base&); /** * An STL-like stream API for log4cxx using char as the character type. - *. Instances of log4cxx::logstream + *. 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 * static instance should be avoided in the same manner as you would avoid placing a std::ostringstream @@ -221,7 +221,7 @@ * level for the stream is not the same of higher that the level of the associated logger. */ class LOG4CXX_EXPORT logstream : public logstream_base { - typedef char Ch; + typedef char Ch; public: /** * Constructor. @@ -264,7 +264,7 @@ /** * Alias for insertion operator for location. Kludge to avoid - * inappropriate compiler ambiguity. + * inappropriate compiler ambiguity. */ logstream& operator>>(const log4cxx::spi::LocationInfo& location); @@ -324,7 +324,7 @@ #if LOG4CXX_WCHAR_T_API /** * An STL-like stream API for log4cxx using wchar_t as the character type. - *. Instances of log4cxx::logstream + *. 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 * static instance should be avoided in the same manner as you would avoid placing a std::ostringstream @@ -332,7 +332,7 @@ * level for the stream is not the same of higher that the level of the associated logger. */ class LOG4CXX_EXPORT wlogstream : public logstream_base { - typedef wchar_t Ch; + typedef wchar_t Ch; public: /** * Constructor. @@ -375,7 +375,7 @@ /** * Alias for insertion operator for location. Kludge to avoid - * inappropriate compiler ambiguity. + * inappropriate compiler ambiguity. */ wlogstream& operator>>(const log4cxx::spi::LocationInfo& location); @@ -436,7 +436,7 @@ #if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API /** * An STL-like stream API for log4cxx using UniChar as the character type. - *. Instances of log4cxx::logstream + *. 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 * static instance should be avoided in the same manner as you would avoid placing a std::ostringstream @@ -444,7 +444,7 @@ * level for the stream is not the same of higher that the level of the associated logger. */ class LOG4CXX_EXPORT ulogstream : public logstream_base { - typedef UniChar Ch; + typedef UniChar Ch; public: /** * Constructor. @@ -494,7 +494,7 @@ /** * Alias for insertion operator for location. Kludge to avoid - * inappropriate compiler ambiguity. + * inappropriate compiler ambiguity. */ ulogstream& operator>>(const log4cxx::spi::LocationInfo& location);
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h (original) +++ logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h Tue Feb 12 17:23:18 2008 @@ -170,7 +170,7 @@ */ virtual bool ignoresThrowable() const { return true; } }; - LOG4CXX_PTR_DEF(TTCCLayout); + LOG4CXX_PTR_DEF(TTCCLayout); } #endif Modified: logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h (original) +++ logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h Tue Feb 12 17:23:18 2008 @@ -40,8 +40,8 @@ #include <log4cxx/config/propertysetter.h> extern "C" { - struct apr_xml_doc; - struct apr_xml_elem; + struct apr_xml_doc; + struct apr_xml_elem; } namespace log4cxx @@ -195,7 +195,7 @@ log4cxx::helpers::Pool& p, log4cxx::helpers::CharsetDecoderPtr& utf8Decoder, apr_xml_elem* elem, - log4cxx::config::PropertySetter& propSetter); + log4cxx::config::PropertySetter& propSetter); /** Used internally to configure the log4cxx framework from @@ -305,7 +305,7 @@ DOMConfigurator& operator=(const DOMConfigurator&); }; - LOG4CXX_PTR_DEF(DOMConfigurator); + LOG4CXX_PTR_DEF(DOMConfigurator); } // namespace xml } // namespace log4cxx Modified: logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h (original) +++ logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h Tue Feb 12 17:23:18 2008 @@ -131,7 +131,7 @@ { return false; } }; // class XMLLayout - LOG4CXX_PTR_DEF(XMLLayout); + LOG4CXX_PTR_DEF(XMLLayout); } // namespace xml } // namespace log4cxx Modified: logging/log4cxx/trunk/src/test/cpp/abts.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/abts.cpp?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/test/cpp/abts.cpp (original) +++ logging/log4cxx/trunk/src/test/cpp/abts.cpp Tue Feb 12 17:23:18 2008 @@ -391,7 +391,7 @@ initialize(); #if defined(_MSC_VER) - quiet = 1; + quiet = 1; #else quiet = !isatty(STDOUT_FILENO); #endif Modified: logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp (original) +++ logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp Tue Feb 12 17:23:18 2008 @@ -246,8 +246,8 @@ const std::vector<spi::LoggingEventPtr>& events = blockableAppender->getVector(); LoggingEventPtr initialEvent = events[0]; LoggingEventPtr discardEvent = events[events.size() - 1]; - LOGUNIT_ASSERT(initialEvent->getMessage() == LOG4CXX_STR("Hello, World")); - LOGUNIT_ASSERT(discardEvent->getMessage().substr(0,10) == LOG4CXX_STR("Discarded ")); + LOGUNIT_ASSERT(initialEvent->getMessage() == LOG4CXX_STR("Hello, World")); + LOGUNIT_ASSERT(discardEvent->getMessage().substr(0,10) == LOG4CXX_STR("Discarded ")); LOGUNIT_ASSERT_EQUAL(log4cxx::spi::LocationInfo::getLocationUnavailable().getClassName(), discardEvent->getLocationInformation().getClassName()); } Modified: logging/log4cxx/trunk/src/test/cpp/helpers/messagebuffertest.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/helpers/messagebuffertest.cpp?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/test/cpp/helpers/messagebuffertest.cpp (original) +++ logging/log4cxx/trunk/src/test/cpp/helpers/messagebuffertest.cpp Tue Feb 12 17:23:18 2008 @@ -76,13 +76,13 @@ void testInsertStr() { MessageBuffer buf; std::string greeting("Hello, World"); - char* part1 = (char*) malloc(10*sizeof(wchar_t)); - strcpy(part1, "Hello"); - char* part2 = (char*) malloc(10*sizeof(wchar_t)); - strcpy(part2, ", World"); + char* part1 = (char*) malloc(10*sizeof(wchar_t)); + strcpy(part1, "Hello"); + char* part2 = (char*) malloc(10*sizeof(wchar_t)); + strcpy(part2, ", World"); CharMessageBuffer& retval = buf << part1 << part2; - free(part1); - free(part2); + free(part1); + free(part2); LOGUNIT_ASSERT_EQUAL(greeting, buf.str(retval)); LOGUNIT_ASSERT_EQUAL(false, buf.hasStream()); } @@ -139,13 +139,13 @@ void testInsertWStr() { MessageBuffer buf; std::wstring greeting(L"Hello, World"); - wchar_t* part1 = (wchar_t*) malloc(10*sizeof(wchar_t)); - wcscpy(part1, L"Hello"); - wchar_t* part2 = (wchar_t*) malloc(10*sizeof(wchar_t)); - wcscpy(part2, L", World"); + wchar_t* part1 = (wchar_t*) malloc(10*sizeof(wchar_t)); + wcscpy(part1, L"Hello"); + wchar_t* part2 = (wchar_t*) malloc(10*sizeof(wchar_t)); + wcscpy(part2, L", World"); WideMessageBuffer& retval = buf << part1 << part2; - free(part1); - free(part2); + free(part1); + free(part2); LOGUNIT_ASSERT_EQUAL(greeting, buf.str(retval)); LOGUNIT_ASSERT_EQUAL(false, buf.hasStream()); } Modified: logging/log4cxx/trunk/src/test/cpp/helpers/optionconvertertestcase.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/helpers/optionconvertertestcase.cpp?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/test/cpp/helpers/optionconvertertestcase.cpp (original) +++ logging/log4cxx/trunk/src/test/cpp/helpers/optionconvertertestcase.cpp Tue Feb 12 17:23:18 2008 @@ -171,18 +171,18 @@ apr_gid_t groupid; stat = apr_uid_current(&userid, &groupid, p); if (stat == APR_SUCCESS) { - char* username = NULL; - stat = apr_uid_name_get(&username, userid, p); - if (stat == APR_SUCCESS) { - char* dirname = NULL; - stat = apr_uid_homepath_get(&dirname, username, p); - if (stat == APR_SUCCESS) { - LogString expected; - Transcoder::decode(dirname, expected); - LOGUNIT_ASSERT_EQUAL(expected, actual); - } - } - } + char* username = NULL; + stat = apr_uid_name_get(&username, userid, p); + if (stat == APR_SUCCESS) { + char* dirname = NULL; + stat = apr_uid_homepath_get(&dirname, username, p); + if (stat == APR_SUCCESS) { + LogString expected; + Transcoder::decode(dirname, expected); + LOGUNIT_ASSERT_EQUAL(expected, actual); + } + } + } apr_pool_destroy(p); } @@ -198,10 +198,10 @@ apr_gid_t groupid; stat = apr_uid_current(&userid, &groupid, p); if (stat == APR_SUCCESS) { - char* username = NULL; + char* username = NULL; stat = apr_uid_name_get(&username, userid, p); if (stat == APR_SUCCESS) { - LogString expected; + LogString expected; Transcoder::decode(username, expected); LOGUNIT_ASSERT_EQUAL(expected, actual); } Modified: logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp (original) +++ logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp Tue Feb 12 17:23:18 2008 @@ -81,7 +81,7 @@ */ void testStringToTrace() { LevelPtr trace(Level::toLevel("TRACE")); - LOGUNIT_ASSERT(trace->toString() == LOG4CXX_STR("TRACE")); + LOGUNIT_ASSERT(trace->toString() == LOG4CXX_STR("TRACE")); } #if LOG4CXX_WCHAR_T_API Modified: logging/log4cxx/trunk/src/test/cpp/logunit.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/logunit.cpp?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/test/cpp/logunit.cpp (original) +++ logging/log4cxx/trunk/src/test/cpp/logunit.cpp Tue Feb 12 17:23:18 2008 @@ -156,8 +156,8 @@ int lineno) { if (expected != actual) { std::string exp, act; - transcode(exp, expected); - transcode(act, actual); + transcode(exp, expected); + transcode(act, actual); abts_str_equal(tc, exp.c_str(), act.c_str(), lineno); throw TestException(); } @@ -171,8 +171,8 @@ int lineno) { if (expected != actual) { std::string exp, act; - transcode(exp, expected); - transcode(act, actual); + transcode(exp, expected); + transcode(act, actual); abts_str_equal(tc, exp.c_str(), act.c_str(), lineno); throw TestException(); } Modified: logging/log4cxx/trunk/src/test/cpp/spi/loggingeventtest.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/spi/loggingeventtest.cpp?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/test/cpp/spi/loggingeventtest.cpp (original) +++ logging/log4cxx/trunk/src/test/cpp/spi/loggingeventtest.cpp Tue Feb 12 17:23:18 2008 @@ -38,7 +38,7 @@ LOGUNIT_TEST(testSerializationWithLocation); LOGUNIT_TEST(testSerializationNDC); LOGUNIT_TEST(testSerializationMDC); - LOGUNIT_TEST_SUITE_END(); + LOGUNIT_TEST_SUITE_END(); public: void setUp() { Modified: logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp (original) +++ logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp Tue Feb 12 17:23:18 2008 @@ -115,7 +115,7 @@ LOGUNIT_TEST(testULogStreamCFString); LOGUNIT_TEST(testULogStreamCFString2); #endif - LOGUNIT_TEST_SUITE_END(); + LOGUNIT_TEST_SUITE_END(); VectorAppenderPtr vectorAppender; Modified: logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp?rev=627213&r1=627212&r2=627213&view=diff ============================================================================== --- logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp (original) +++ logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp Tue Feb 12 17:23:18 2008 @@ -319,7 +319,7 @@ int i = 0; X x; - std::string msg("Message "); + std::string msg("Message "); LOG4CXX_TRACE(logger, msg << i); LOG4CXX_TRACE(root, msg << i);
