Author: afester Date: Mon Jul 17 12:45:12 2006 New Revision: 422815 URL: http://svn.apache.org/viewvc?rev=422815&view=rev Log: LOGCXX-14: Fix "unused parameters" and "unused local variables" when compiling with gcc with -Wunused
Modified: logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h logging/log4cxx/trunk/include/log4cxx/filter/denyallfilter.h logging/log4cxx/trunk/include/log4cxx/htmllayout.h logging/log4cxx/trunk/include/log4cxx/layout.h logging/log4cxx/trunk/include/log4cxx/spi/filter.h logging/log4cxx/trunk/include/log4cxx/varia/fallbackerrorhandler.h logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp logging/log4cxx/trunk/src/action.cpp logging/log4cxx/trunk/src/asyncappender.cpp logging/log4cxx/trunk/src/charsetencoder.cpp logging/log4cxx/trunk/src/classnamepatternconverter.cpp logging/log4cxx/trunk/src/file.cpp logging/log4cxx/trunk/src/filelocationpatternconverter.cpp logging/log4cxx/trunk/src/fileoutputstream.cpp logging/log4cxx/trunk/src/filewatchdog.cpp logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp logging/log4cxx/trunk/src/fulllocationpatternconverter.cpp logging/log4cxx/trunk/src/htmllayout.cpp logging/log4cxx/trunk/src/integerpatternconverter.cpp logging/log4cxx/trunk/src/levelpatternconverter.cpp logging/log4cxx/trunk/src/linelocationpatternconverter.cpp logging/log4cxx/trunk/src/lineseparatorpatternconverter.cpp logging/log4cxx/trunk/src/loggerpatternconverter.cpp logging/log4cxx/trunk/src/loggingevent.cpp logging/log4cxx/trunk/src/manualtriggeringpolicy.cpp logging/log4cxx/trunk/src/messagepatternconverter.cpp logging/log4cxx/trunk/src/methodlocationpatternconverter.cpp logging/log4cxx/trunk/src/nameabbreviator.cpp logging/log4cxx/trunk/src/ndcpatternconverter.cpp logging/log4cxx/trunk/src/patternconverter.cpp logging/log4cxx/trunk/src/propertiespatternconverter.cpp logging/log4cxx/trunk/src/propertyconfigurator.cpp logging/log4cxx/trunk/src/relativetimepatternconverter.cpp logging/log4cxx/trunk/src/rollingpolicybase.cpp logging/log4cxx/trunk/src/simpledateformat.cpp logging/log4cxx/trunk/src/sizebasedtriggeringpolicy.cpp logging/log4cxx/trunk/src/socketappender.cpp logging/log4cxx/trunk/src/socketappenderskeleton.cpp logging/log4cxx/trunk/src/sockethubappender.cpp logging/log4cxx/trunk/src/socketinputstream.cpp logging/log4cxx/trunk/src/strftimedateformat.cpp logging/log4cxx/trunk/src/systemerrwriter.cpp logging/log4cxx/trunk/src/systemoutwriter.cpp logging/log4cxx/trunk/src/telnetappender.cpp logging/log4cxx/trunk/src/threadpatternconverter.cpp logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp logging/log4cxx/trunk/src/timebasedrollingpolicy.cpp logging/log4cxx/trunk/src/unicodehelper.cpp logging/log4cxx/trunk/src/xmlsocketappender.cpp logging/log4cxx/trunk/tests/src/filetestcase.cpp logging/log4cxx/trunk/tests/src/loggertestcase.cpp logging/log4cxx/trunk/tests/src/rolling/filenamepatterntestcase.cpp logging/log4cxx/trunk/tests/src/util/compare.cpp logging/log4cxx/trunk/tests/src/util/xmlfilenamefilter.cpp logging/log4cxx/trunk/tests/src/vectorappender.cpp Modified: logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h (original) +++ logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h Mon Jul 17 12:45:12 2006 @@ -89,7 +89,7 @@ Derived appenders should override this method if option structure requires it. */ - virtual void activateOptions(log4cxx::helpers::Pool& pool) {} + virtual void activateOptions(log4cxx::helpers::Pool& /* pool */) {} virtual void setOption(const LogString& option, const LogString& value); /** Modified: logging/log4cxx/trunk/include/log4cxx/filter/denyallfilter.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/filter/denyallfilter.h?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/include/log4cxx/filter/denyallfilter.h (original) +++ logging/log4cxx/trunk/include/log4cxx/filter/denyallfilter.h Mon Jul 17 12:45:12 2006 @@ -50,7 +50,7 @@ @param event The LoggingEvent to filter. @return Always returns [EMAIL PROTECTED] spi::Filter#DENY DENY}. */ - FilterDecision decide(const spi::LoggingEventPtr& event) const + FilterDecision decide(const spi::LoggingEventPtr& /* event */) const { return spi::Filter::DENY; } }; // class DenyAllFilter Modified: logging/log4cxx/trunk/include/log4cxx/htmllayout.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/htmllayout.h?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/include/log4cxx/htmllayout.h (original) +++ logging/log4cxx/trunk/include/log4cxx/htmllayout.h Mon Jul 17 12:45:12 2006 @@ -91,7 +91,7 @@ /** No options to activate. */ - virtual void activateOptions(log4cxx::helpers::Pool& p) {} + virtual void activateOptions(log4cxx::helpers::Pool& /* p */) {} /** Set options Modified: logging/log4cxx/trunk/include/log4cxx/layout.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/layout.h?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/include/log4cxx/layout.h (original) +++ logging/log4cxx/trunk/include/log4cxx/layout.h Mon Jul 17 12:45:12 2006 @@ -65,13 +65,13 @@ Append the header for the layout format. The base class does nothing. */ - virtual void appendHeader(LogString& output, log4cxx::helpers::Pool& p) {} + virtual void appendHeader(LogString& /* output */, log4cxx::helpers::Pool& /* p */) {} /** Append the footer for the layout format. The base class does nothing. */ - virtual void appendFooter(LogString& output, log4cxx::helpers::Pool& p) {} + virtual void appendFooter(LogString& /* output */, log4cxx::helpers::Pool& /* p */) {} /** If the layout handles the throwable object contained within Modified: logging/log4cxx/trunk/include/log4cxx/spi/filter.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/spi/filter.h?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/include/log4cxx/spi/filter.h (original) +++ logging/log4cxx/trunk/include/log4cxx/spi/filter.h Mon Jul 17 12:45:12 2006 @@ -115,8 +115,8 @@ default do-nothing implementation for convenience. */ - void activateOptions(log4cxx::helpers::Pool& p) {} - void setOption(const LogString& option, const LogString& value) {} + void activateOptions(log4cxx::helpers::Pool& /* p */) {} + void setOption(const LogString& /* option */, const LogString& /* value */) {} /** <p>If the decision is <code>DENY</code>, then the event will be Modified: logging/log4cxx/trunk/include/log4cxx/varia/fallbackerrorhandler.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/varia/fallbackerrorhandler.h?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/include/log4cxx/varia/fallbackerrorhandler.h (original) +++ logging/log4cxx/trunk/include/log4cxx/varia/fallbackerrorhandler.h Mon Jul 17 12:45:12 2006 @@ -87,7 +87,7 @@ Print a the error message passed as parameter on <code>System.err</code>. */ - void error(const LogString& message) const {} + void error(const LogString& /* message */) const {} /** Return the backup appender. Modified: logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h (original) +++ logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h Mon Jul 17 12:45:12 2006 @@ -89,7 +89,7 @@ { return locationInfo; } /** No options to activate. */ - void activateOptions(log4cxx::helpers::Pool& p) { } + void activateOptions(log4cxx::helpers::Pool& /* p */) { } /** Set options Modified: logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp (original) +++ logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp Mon Jul 17 12:45:12 2006 @@ -61,7 +61,7 @@ } } -void* LOG4CXX_THREAD_FUNC runSocket(log4cxx_thread_t* thread, void* data) { +void* LOG4CXX_THREAD_FUNC runSocket(log4cxx_thread_t* /* thread */, void* data) { SocketNode* node = (SocketNode*) data; node->run(); delete node; Modified: logging/log4cxx/trunk/src/action.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/action.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/action.cpp (original) +++ logging/log4cxx/trunk/src/action.cpp Mon Jul 17 12:45:12 2006 @@ -68,5 +68,5 @@ * * @param ex exception. */ -void Action::reportException(const std::exception& ex) { +void Action::reportException(const std::exception& /* ex */) { } Modified: logging/log4cxx/trunk/src/asyncappender.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/asyncappender.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/asyncappender.cpp (original) +++ logging/log4cxx/trunk/src/asyncappender.cpp Mon Jul 17 12:45:12 2006 @@ -59,7 +59,7 @@ aai->addAppender(newAppender); } -void AsyncAppender::append(const spi::LoggingEventPtr& event, Pool& p) +void AsyncAppender::append(const spi::LoggingEventPtr& event, Pool& /* p */ ) { // Set the NDC and thread name for the calling thread as these // LoggingEvent fields were not set at event creation time. @@ -168,7 +168,7 @@ aai->removeAppender(name1); } -void* LOG4CXX_THREAD_FUNC AsyncAppender::dispatch(log4cxx_thread_t* thread, void* data) { +void* LOG4CXX_THREAD_FUNC AsyncAppender::dispatch(log4cxx_thread_t* /* thread */ , void* data) { AsyncAppender* pThis = (AsyncAppender*) data; LoggingEventPtr event; while(true) { Modified: logging/log4cxx/trunk/src/charsetencoder.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/charsetencoder.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/charsetencoder.cpp (original) +++ logging/log4cxx/trunk/src/charsetencoder.cpp Mon Jul 17 12:45:12 2006 @@ -118,11 +118,8 @@ if (iter != in.end()) { size_t outbytes_left = out.remaining(); - size_t initial_outbytes_left = outbytes_left; size_t position = out.position(); std::wstring::size_type inOffset = (iter - in.begin()); - size_t inchars_left = (in.size() - inOffset); - apr_size_t initial_inchars_left = inchars_left; enum { BUFSIZE = 256 }; wchar_t buf[BUFSIZE]; size_t chunkSize = BUFSIZE - 1; @@ -557,7 +554,7 @@ void CharsetEncoder::reset() { } -void CharsetEncoder::flush(ByteBuffer& out) { +void CharsetEncoder::flush(ByteBuffer& /* out */ ) { } Modified: logging/log4cxx/trunk/src/classnamepatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/classnamepatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/classnamepatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/classnamepatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -43,7 +43,7 @@ void ClassNamePatternConverter::format( const LoggingEventPtr& event, LogString& toAppendTo, - Pool& p) const { + Pool& /* p */) const { int initialLength = toAppendTo.length(); append(toAppendTo, event->getLocationInformation().getClassName()); abbreviate(initialLength, toAppendTo); Modified: logging/log4cxx/trunk/src/file.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/file.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/file.cpp (original) +++ logging/log4cxx/trunk/src/file.cpp Mon Jul 17 12:45:12 2006 @@ -130,7 +130,7 @@ } -std::vector<LogString> File::list(Pool& p) const { +std::vector<LogString> File::list(Pool& /* p */ ) const { return std::vector<LogString>(); // // TODO: Modified: logging/log4cxx/trunk/src/filelocationpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/filelocationpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/filelocationpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/filelocationpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -31,7 +31,7 @@ } PatternConverterPtr FileLocationPatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */ ) { static PatternConverterPtr instance(new FileLocationPatternConverter()); return instance; } @@ -39,6 +39,6 @@ void FileLocationPatternConverter::format( const LoggingEventPtr& event, LogString& toAppendTo, - Pool& p) const { + Pool& /* p */ ) const { append(toAppendTo, event->getLocationInformation().getFileName()); } Modified: logging/log4cxx/trunk/src/fileoutputstream.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/fileoutputstream.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/fileoutputstream.cpp (original) +++ logging/log4cxx/trunk/src/fileoutputstream.cpp Mon Jul 17 12:45:12 2006 @@ -50,7 +50,7 @@ } } -void FileOutputStream::close(Pool& p) { +void FileOutputStream::close(Pool& /* p */) { apr_status_t stat = apr_file_close((apr_file_t*) fileptr); if (stat == APR_SUCCESS) { fileptr = NULL; @@ -59,10 +59,10 @@ } } -void FileOutputStream::flush(Pool& p) { +void FileOutputStream::flush(Pool& /* p */) { } -void FileOutputStream::write(ByteBuffer& buf, Pool& p) { +void FileOutputStream::write(ByteBuffer& buf, Pool& /* p */ ) { if (fileptr == NULL) { throw IOException(-1); } Modified: logging/log4cxx/trunk/src/filewatchdog.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/filewatchdog.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/filewatchdog.cpp (original) +++ logging/log4cxx/trunk/src/filewatchdog.cpp Mon Jul 17 12:45:12 2006 @@ -66,7 +66,7 @@ } } -void* APR_THREAD_FUNC FileWatchdog::run(log4cxx_thread_t* thread, void* data) { +void* APR_THREAD_FUNC FileWatchdog::run(log4cxx_thread_t* /* thread */, void* data) { FileWatchdog* pThis = (FileWatchdog*) data; unsigned int interrupted = apr_atomic_read32(&pThis->interrupted); Modified: logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp (original) +++ logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp Mon Jul 17 12:45:12 2006 @@ -33,10 +33,10 @@ bool FilterBasedTriggeringPolicy::isTriggeringEvent( - Appender* appender, + Appender* /* appender */, const log4cxx::spi::LoggingEventPtr& event, - const LogString& filename, - size_t fileLength) { + const LogString& /* filename */, + size_t /* fileLength */ ) { if (headFilter == NULL) { return false; } @@ -85,7 +85,7 @@ } } -void FilterBasedTriggeringPolicy::setOption(const LogString& option, const LogString& value) { +void FilterBasedTriggeringPolicy::setOption(const LogString& /* option */, const LogString& /* value */ ) { } Modified: logging/log4cxx/trunk/src/fulllocationpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/fulllocationpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/fulllocationpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/fulllocationpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -33,7 +33,7 @@ } PatternConverterPtr FullLocationPatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */) { static PatternConverterPtr instance(new FullLocationPatternConverter()); return instance; } Modified: logging/log4cxx/trunk/src/htmllayout.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/htmllayout.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/htmllayout.cpp (original) +++ logging/log4cxx/trunk/src/htmllayout.cpp Mon Jul 17 12:45:12 2006 @@ -174,7 +174,7 @@ output.append(LOG4CXX_STR("</tr>") LOG4CXX_EOL); } -void HTMLLayout::appendFooter(LogString& output, Pool& pool) +void HTMLLayout::appendFooter(LogString& output, Pool& /* pool */ ) { output.append(LOG4CXX_STR("</table>") LOG4CXX_EOL); output.append(LOG4CXX_STR("<br>") LOG4CXX_EOL); Modified: logging/log4cxx/trunk/src/integerpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/integerpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/integerpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/integerpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -32,7 +32,7 @@ } PatternConverterPtr IntegerPatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */) { static PatternConverterPtr instance(new IntegerPatternConverter()); return instance; } Modified: logging/log4cxx/trunk/src/levelpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/levelpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/levelpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/levelpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -34,7 +34,7 @@ } PatternConverterPtr LevelPatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */) { static PatternConverterPtr def(new LevelPatternConverter()); return def; } @@ -42,7 +42,7 @@ void LevelPatternConverter::format( const LoggingEventPtr& event, LogString& toAppendTo, - log4cxx::helpers::Pool& p) const { + log4cxx::helpers::Pool& /* p */) const { toAppendTo.append(event->getLevel()->toString()); } Modified: logging/log4cxx/trunk/src/linelocationpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/linelocationpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/linelocationpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/linelocationpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -33,7 +33,7 @@ } PatternConverterPtr LineLocationPatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */) { static PatternConverterPtr instance(new LineLocationPatternConverter()); return instance; } Modified: logging/log4cxx/trunk/src/lineseparatorpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/lineseparatorpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/lineseparatorpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/lineseparatorpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -33,21 +33,21 @@ } PatternConverterPtr LineSeparatorPatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */) { static PatternConverterPtr instance(new LineSeparatorPatternConverter()); return instance; } void LineSeparatorPatternConverter::format( - const LoggingEventPtr& event, + const LoggingEventPtr& /* event */, LogString& toAppendTo, - Pool& p) const { + Pool& /* p */) const { toAppendTo.append(LOG4CXX_EOL); } void LineSeparatorPatternConverter::format( - const ObjectPtr& event, + const ObjectPtr& /* event */, LogString& toAppendTo, - Pool& p) const { + Pool& /* p */) const { toAppendTo.append(LOG4CXX_EOL); } Modified: logging/log4cxx/trunk/src/loggerpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/loggerpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/loggerpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/loggerpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -44,7 +44,7 @@ void LoggerPatternConverter::format( const LoggingEventPtr& event, LogString& toAppendTo, - Pool& p) const { + Pool& /* p */ ) const { int initialLength = toAppendTo.length(); toAppendTo.append(event->getLoggerName()); abbreviate(initialLength, toAppendTo); Modified: logging/log4cxx/trunk/src/loggingevent.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/loggingevent.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/loggingevent.cpp (original) +++ logging/log4cxx/trunk/src/loggingevent.cpp Mon Jul 17 12:45:12 2006 @@ -210,7 +210,7 @@ #endif } -void LoggingEvent::read(const helpers::SocketInputStreamPtr& is) +void LoggingEvent::read(const helpers::SocketInputStreamPtr& /* is */) { #if 0 // fqnOfCategoryClass @@ -274,7 +274,7 @@ #endif } -void LoggingEvent::readLevel(const helpers::SocketInputStreamPtr& is) +void LoggingEvent::readLevel(const helpers::SocketInputStreamPtr& /* is */) { #if 0 int levelInt; @@ -318,7 +318,7 @@ (*properties)[key] = value; } -void LoggingEvent::write(helpers::SocketOutputStreamPtr& os) const +void LoggingEvent::write(helpers::SocketOutputStreamPtr& /* os */) const { #if 0 // fqnOfCategoryClass @@ -380,7 +380,7 @@ #endif } -void LoggingEvent::writeLevel(helpers::SocketOutputStreamPtr& os) const +void LoggingEvent::writeLevel(helpers::SocketOutputStreamPtr& /* os */) const { #if 0 os->write(level->toInt()); Modified: logging/log4cxx/trunk/src/manualtriggeringpolicy.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/manualtriggeringpolicy.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/manualtriggeringpolicy.cpp (original) +++ logging/log4cxx/trunk/src/manualtriggeringpolicy.cpp Mon Jul 17 12:45:12 2006 @@ -27,15 +27,15 @@ ManualTriggeringPolicy::ManualTriggeringPolicy() { } -bool ManualTriggeringPolicy::isTriggeringEvent(Appender* appender, - const log4cxx::spi::LoggingEventPtr& event, - const LogString& file, - size_t fileLength) { +bool ManualTriggeringPolicy::isTriggeringEvent(Appender* /* appender */, + const log4cxx::spi::LoggingEventPtr& /* event */, + const LogString& /* file */, + size_t /* fileLength */ ) { return false; } -void ManualTriggeringPolicy::activateOptions(Pool& p) { +void ManualTriggeringPolicy::activateOptions(Pool& /* p */ ) { } -void ManualTriggeringPolicy::setOption(const LogString& option, const LogString& value) { +void ManualTriggeringPolicy::setOption(const LogString& /* option */ , const LogString& /* value */ ) { } Modified: logging/log4cxx/trunk/src/messagepatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/messagepatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/messagepatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/messagepatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -34,7 +34,7 @@ } PatternConverterPtr MessagePatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */) { static PatternConverterPtr def(new MessagePatternConverter()); return def; } @@ -42,7 +42,7 @@ void MessagePatternConverter::format( const LoggingEventPtr& event, LogString& toAppendTo, - Pool& p) const { + Pool& /* p */) const { toAppendTo.append(event->getRenderedMessage()); } Modified: logging/log4cxx/trunk/src/methodlocationpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/methodlocationpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/methodlocationpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/methodlocationpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -34,7 +34,7 @@ } PatternConverterPtr MethodLocationPatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */ ) { static PatternConverterPtr def(new MethodLocationPatternConverter()); return def; } @@ -42,7 +42,6 @@ void MethodLocationPatternConverter::format( const LoggingEventPtr& event, LogString& toAppendTo, - Pool& p) const { - int initialLength = toAppendTo.length(); + Pool& /* p */ ) const { append(toAppendTo, event->getLocationInformation().getMethodName()); } Modified: logging/log4cxx/trunk/src/nameabbreviator.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/nameabbreviator.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/nameabbreviator.cpp (original) +++ logging/log4cxx/trunk/src/nameabbreviator.cpp Mon Jul 17 12:45:12 2006 @@ -53,7 +53,7 @@ /** * [EMAIL PROTECTED] */ - void abbreviate(LogString::size_type nameStart, LogString& buf) const { + void abbreviate(LogString::size_type /* nameStart */, LogString& /* buf */) const { } }; @@ -86,8 +86,6 @@ * @param nameStart start of name to abbreviate. */ void abbreviate(LogString::size_type nameStart, LogString& buf) const { - LogString::size_type len = buf.length() - nameStart; - // We substract 1 from 'len' when assigning to 'end' to avoid out of // bounds exception in return r.substring(end+1, len). This can happen if // precision is 1 and the category name ends with a dot. Modified: logging/log4cxx/trunk/src/ndcpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ndcpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/ndcpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/ndcpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -35,7 +35,7 @@ } PatternConverterPtr NDCPatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */) { static PatternConverterPtr def(new NDCPatternConverter()); return def; } @@ -43,7 +43,6 @@ void NDCPatternConverter::format( const LoggingEventPtr& event, LogString& toAppendTo, - Pool& p) const { - int initialLength = toAppendTo.length(); + Pool& /* p */) const { toAppendTo.append(event->getNDC()); } Modified: logging/log4cxx/trunk/src/patternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/patternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/patternconverter.cpp (original) +++ logging/log4cxx/trunk/src/patternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -35,7 +35,7 @@ return name; } -LogString PatternConverter::getStyleClass(const log4cxx::helpers::ObjectPtr& e) const { +LogString PatternConverter::getStyleClass(const log4cxx::helpers::ObjectPtr& /* e */) const { return style; } Modified: logging/log4cxx/trunk/src/propertiespatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/propertiespatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/propertiespatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/propertiespatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -51,7 +51,7 @@ void PropertiesPatternConverter::format( const LoggingEventPtr& event, LogString& toAppendTo, - Pool& p) const { + Pool& /* p */) const { if (option.length() == 0) { toAppendTo.append(1, LOG4CXX_STR('{')); Modified: logging/log4cxx/trunk/src/propertyconfigurator.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/propertyconfigurator.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/propertyconfigurator.cpp (original) +++ logging/log4cxx/trunk/src/propertyconfigurator.cpp Mon Jul 17 12:45:12 2006 @@ -282,7 +282,7 @@ This method must work for the root category as well. */ void PropertyConfigurator::parseCategory( - helpers::Properties& props, LoggerPtr& logger, const LogString& optionKey, + helpers::Properties& props, LoggerPtr& logger, const LogString& /* optionKey */, const LogString& loggerName, const LogString& value) { LogLog::debug(((LogString) LOG4CXX_STR("Parsing for [")) Modified: logging/log4cxx/trunk/src/relativetimepatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/relativetimepatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/relativetimepatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/relativetimepatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -34,7 +34,7 @@ } PatternConverterPtr RelativeTimePatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */) { static PatternConverterPtr def(new RelativeTimePatternConverter()); return def; } Modified: logging/log4cxx/trunk/src/rollingpolicybase.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/rollingpolicybase.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/rollingpolicybase.cpp (original) +++ logging/log4cxx/trunk/src/rollingpolicybase.cpp Mon Jul 17 12:45:12 2006 @@ -34,7 +34,7 @@ RollingPolicyBase::~RollingPolicyBase() { } -void RollingPolicyBase::activateOptions(log4cxx::helpers::Pool& pool) { +void RollingPolicyBase::activateOptions(log4cxx::helpers::Pool& /* pool */) { if (fileNamePatternStr.length() > 0) { parseFileNamePattern(); } else { Modified: logging/log4cxx/trunk/src/simpledateformat.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/simpledateformat.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/simpledateformat.cpp (original) +++ logging/log4cxx/trunk/src/simpledateformat.cpp Mon Jul 17 12:45:12 2006 @@ -1,9 +1,17 @@ -/* * Copyright 2003,2005 The Apache Software Foundation. * * Licensed 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. */ +/* + * Copyright 2003,2005 The Apache Software Foundation. * + * Licensed 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. + */ #include <log4cxx/logstring.h> #include <log4cxx/helpers/simpledateformat.h> @@ -148,7 +156,7 @@ { } -void PatternToken::setTimeZone( const TimeZonePtr & zone ) +void PatternToken::setTimeZone( const TimeZonePtr & /* zone */ ) { } @@ -160,7 +168,7 @@ { } - void format( LocaleString& s, const apr_time_exp_t & tm, Pool & p ) const + void format( LocaleString& s, const apr_time_exp_t & , Pool & /* p */ ) const { s.append( count, ch ); } @@ -175,11 +183,11 @@ class EraToken : public PatternToken { public: - EraToken( int count, const std::locale * locale ) + EraToken( int /* count */ , const std::locale * /* locale */ ) { } - void format( LocaleString& s, const apr_time_exp_t & tm, Pool & p ) const + void format( LocaleString& s, const apr_time_exp_t & /* tm */, Pool & /* p */ ) const { s.append( LOG4CXX_LOCALE_STR( "AD" ) ); } @@ -247,7 +255,15 @@ class AbbreviatedMonthNameToken : public PatternToken { public: - AbbreviatedMonthNameToken( int width, const std::locale * locale ) : names( 12 ) + AbbreviatedMonthNameToken( int +#if LOG4CXX_HAS_STD_LOCALE + width +#endif + , const std::locale * +#if LOG4CXX_HAS_STD_LOCALE + locale +#endif + ) : names( 12 ) { #if LOG4CXX_HAS_STD_LOCALE if ( locale != NULL ) @@ -276,7 +292,7 @@ } } - void format( LocaleString& s, const apr_time_exp_t & tm, Pool & p ) const + void format( LocaleString& s, const apr_time_exp_t & tm, Pool & /* p */ ) const { s.append( names[tm.tm_mon] ); } @@ -291,7 +307,15 @@ class FullMonthNameToken : public PatternToken { public: - FullMonthNameToken( int width, const std::locale * locale ) : names( 12 ) + FullMonthNameToken( int +#if LOG4CXX_HAS_STD_LOCALE + width +#endif + , const std::locale * +#if LOG4CXX_HAS_STD_LOCALE + locale +#endif + ) : names( 12 ) { #if LOG4CXX_HAS_STD_LOCALE if ( locale != NULL ) @@ -320,7 +344,7 @@ } } - void format( LocaleString& s, const apr_time_exp_t & tm, Pool & p ) const + void format( LocaleString& s, const apr_time_exp_t & tm, Pool & /* p */ ) const { s.append( names[tm.tm_mon] ); } @@ -398,7 +422,7 @@ { } - int getField( const apr_time_exp_t & tm ) const + int getField( const apr_time_exp_t & /* tm */ ) const { return -1; } @@ -409,7 +433,15 @@ class AbbreviatedDayNameToken : public PatternToken { public: - AbbreviatedDayNameToken( int width, const std::locale * locale ) : names( 7 ) + AbbreviatedDayNameToken( int +#if LOG4CXX_HAS_STD_LOCALE + width +#endif + , const std::locale * +#if LOG4CXX_HAS_STD_LOCALE + locale +#endif + ) : names( 7 ) { #if LOG4CXX_HAS_STD_LOCALE if ( locale != NULL ) @@ -438,7 +470,7 @@ } } - void format( LocaleString& s, const apr_time_exp_t & tm, Pool & p ) const + void format( LocaleString& s, const apr_time_exp_t & tm, Pool & /* p */ ) const { s.append( names[tm.tm_wday] ); } @@ -453,7 +485,15 @@ class FullDayNameToken : public PatternToken { public: - FullDayNameToken( int width, const std::locale * locale ) : names( 7 ) + FullDayNameToken( int +#if LOG4CXX_HAS_STD_LOCALE + width +#endif + , const std::locale * +#if LOG4CXX_HAS_STD_LOCALE + locale +#endif + ) : names( 7 ) { #if LOG4CXX_HAS_STD_LOCALE if ( locale != NULL ) @@ -482,7 +522,7 @@ } } - void format( LocaleString& s, const apr_time_exp_t & tm, Pool & p ) const + void format( LocaleString& s, const apr_time_exp_t & tm, Pool & /* p */ ) const { s.append( names[tm.tm_wday] ); } @@ -515,7 +555,7 @@ class HourToken : public NumericToken { public: - HourToken( int width1, int offset1 ) : NumericToken( width1 ) + HourToken( int width1, int /* offset1 */ ) : NumericToken( width1 ) { } @@ -578,7 +618,15 @@ class AMPMToken : public PatternToken { public: - AMPMToken( int width, const std::locale * locale ) : names( 2 ) + AMPMToken( int +#if LOG4CXX_HAS_STD_LOCALE + width +#endif + , const std::locale * +#if LOG4CXX_HAS_STD_LOCALE + locale +#endif + ) : names( 2 ) { #if LOG4CXX_HAS_STD_LOCALE if ( locale != NULL ) @@ -607,7 +655,7 @@ } } - void format( LocaleString& s, const apr_time_exp_t & tm, Pool & p ) const + void format( LocaleString& s, const apr_time_exp_t & tm, Pool & /* p */ ) const { s.append( names[tm.tm_hour / 12] ); } @@ -621,11 +669,11 @@ class GeneralTimeZoneToken : public PatternToken { public: - GeneralTimeZoneToken( int width ) + GeneralTimeZoneToken( int /* width */ ) { } - void format( LocaleString& s, const apr_time_exp_t & tm, Pool & p ) const + void format( LocaleString& s, const apr_time_exp_t & , Pool & /* p */ ) const { LocaleString tzID; Transcoder::encode( timeZone->getID(), tzID ); @@ -646,7 +694,7 @@ class RFC822TimeZoneToken : public PatternToken { public: - RFC822TimeZoneToken( int width ) + RFC822TimeZoneToken( int /* width */ ) { } Modified: logging/log4cxx/trunk/src/sizebasedtriggeringpolicy.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/sizebasedtriggeringpolicy.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/sizebasedtriggeringpolicy.cpp (original) +++ logging/log4cxx/trunk/src/sizebasedtriggeringpolicy.cpp Mon Jul 17 12:45:12 2006 @@ -28,9 +28,9 @@ : maxFileSize(10 * 1024 * 1024) { } -bool SizeBasedTriggeringPolicy::isTriggeringEvent(Appender* appender, - const log4cxx::spi::LoggingEventPtr& event, - const LogString& file, +bool SizeBasedTriggeringPolicy::isTriggeringEvent(Appender* /* appender */, + const log4cxx::spi::LoggingEventPtr& /* event */, + const LogString& /* file */, size_t fileLength) { return (fileLength >= maxFileSize); } @@ -43,7 +43,7 @@ maxFileSize = l; } -void SizeBasedTriggeringPolicy::activateOptions(Pool& p) { +void SizeBasedTriggeringPolicy::activateOptions(Pool& /* p */) { } void SizeBasedTriggeringPolicy::setOption(const LogString& option, const LogString& value) { Modified: logging/log4cxx/trunk/src/socketappender.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/socketappender.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/socketappender.cpp (original) +++ logging/log4cxx/trunk/src/socketappender.cpp Mon Jul 17 12:45:12 2006 @@ -62,7 +62,7 @@ void SocketAppender::renderEvent(const spi::LoggingEventPtr& event, helpers::SocketOutputStreamPtr& os1, - Pool& p) + Pool& /* p */) { event->write(os1); } Modified: logging/log4cxx/trunk/src/socketappenderskeleton.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/socketappenderskeleton.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/socketappenderskeleton.cpp (original) +++ logging/log4cxx/trunk/src/socketappenderskeleton.cpp Mon Jul 17 12:45:12 2006 @@ -74,7 +74,7 @@ finalize(); } -void SocketAppenderSkeleton::activateOptions(Pool& p) +void SocketAppenderSkeleton::activateOptions(Pool& /* p */ ) { connect(); } @@ -203,7 +203,7 @@ } } -void* APR_THREAD_FUNC SocketAppenderSkeleton::monitor(log4cxx_thread_t* thread, void* data) { +void* APR_THREAD_FUNC SocketAppenderSkeleton::monitor(log4cxx_thread_t* /* thread */, void* data) { SocketAppenderSkeleton* socketAppender = (SocketAppenderSkeleton*) data; SocketPtr socket; apr_uint32_t isClosed = apr_atomic_read32(&socketAppender->closed); Modified: logging/log4cxx/trunk/src/sockethubappender.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/sockethubappender.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/sockethubappender.cpp (original) +++ logging/log4cxx/trunk/src/sockethubappender.cpp Mon Jul 17 12:45:12 2006 @@ -53,7 +53,7 @@ startServer(); } -void SocketHubAppender::activateOptions(Pool& p) +void SocketHubAppender::activateOptions(Pool& /* p */ ) { startServer(); } @@ -108,7 +108,7 @@ + getName() + LOG4CXX_STR(" closed")); } -void SocketHubAppender::append(const spi::LoggingEventPtr& event, Pool& p) +void SocketHubAppender::append(const spi::LoggingEventPtr& event, Pool& /* p */ ) { // if no open connections, exit now @@ -151,7 +151,7 @@ thread.run(monitor, this); } -void* APR_THREAD_FUNC SocketHubAppender::monitor(log4cxx_thread_t* thread, void* data) { +void* APR_THREAD_FUNC SocketHubAppender::monitor(log4cxx_thread_t* /* thread */, void* data) { SocketHubAppender* pThis = (SocketHubAppender*) data; ServerSocket * serverSocket = 0; Modified: logging/log4cxx/trunk/src/socketinputstream.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/socketinputstream.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/socketinputstream.cpp (original) +++ logging/log4cxx/trunk/src/socketinputstream.cpp Mon Jul 17 12:45:12 2006 @@ -148,7 +148,7 @@ // LOGLOG_DEBUG(_T("long read:") << value); } -void SocketInputStream::read(LogString& value) const +void SocketInputStream::read(LogString& /* value */) const { LogString::size_type size = 0; Modified: logging/log4cxx/trunk/src/strftimedateformat.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/strftimedateformat.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/strftimedateformat.cpp (original) +++ logging/log4cxx/trunk/src/strftimedateformat.cpp Mon Jul 17 12:45:12 2006 @@ -33,7 +33,7 @@ } -void StrftimeDateFormat::format(LogString& s, log4cxx_time_t time, Pool& p) const { +void StrftimeDateFormat::format(LogString& s, log4cxx_time_t time, Pool& /* p */ ) const { apr_time_exp_t exploded; apr_status_t stat = timeZone->explode(&exploded, time); if (stat == APR_SUCCESS) { Modified: logging/log4cxx/trunk/src/systemerrwriter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/systemerrwriter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/systemerrwriter.cpp (original) +++ logging/log4cxx/trunk/src/systemerrwriter.cpp Mon Jul 17 12:45:12 2006 @@ -30,13 +30,13 @@ SystemErrWriter::~SystemErrWriter() { } -void SystemErrWriter::close(Pool& p) { +void SystemErrWriter::close(Pool& /* p */) { } -void SystemErrWriter::flush(Pool& p) { +void SystemErrWriter::flush(Pool& /* p */) { } -void SystemErrWriter::write(const LogString& str, Pool& p) { +void SystemErrWriter::write(const LogString& str, Pool& /* p */) { #if LOG4CXX_HAS_WCHAR_T #if LOG4CXX_FORCE_WIDE_CONSOLE if (true) { Modified: logging/log4cxx/trunk/src/systemoutwriter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/systemoutwriter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/systemoutwriter.cpp (original) +++ logging/log4cxx/trunk/src/systemoutwriter.cpp Mon Jul 17 12:45:12 2006 @@ -31,13 +31,13 @@ SystemOutWriter::~SystemOutWriter() { } -void SystemOutWriter::close(Pool& p) { +void SystemOutWriter::close(Pool& /* p */ ) { } -void SystemOutWriter::flush(Pool& p) { +void SystemOutWriter::flush(Pool& /* p */ ) { } -void SystemOutWriter::write(const LogString& str, Pool& p) { +void SystemOutWriter::write(const LogString& str, Pool& /* p */ ) { #if LOG4CXX_HAS_WCHAR_T #if LOG4CXX_FORCE_WIDE_CONSOLE if (true) { Modified: logging/log4cxx/trunk/src/telnetappender.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/telnetappender.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/telnetappender.cpp (original) +++ logging/log4cxx/trunk/src/telnetappender.cpp Mon Jul 17 12:45:12 2006 @@ -50,7 +50,7 @@ delete serverSocket; } -void TelnetAppender::activateOptions(Pool& p) +void TelnetAppender::activateOptions(Pool& /* p */) { if (serverSocket == NULL) { serverSocket = new ServerSocket(port); @@ -108,7 +108,7 @@ activeConnections = 0; } -void TelnetAppender::append(const spi::LoggingEventPtr& event, Pool& p) +void TelnetAppender::append(const spi::LoggingEventPtr& event, Pool& /* p */) { apr_uint32_t count = apr_atomic_read32(&activeConnections); if (count > 0) { @@ -141,7 +141,7 @@ } } -void* APR_THREAD_FUNC TelnetAppender::acceptConnections(log4cxx_thread_t* thread, void* data) { +void* APR_THREAD_FUNC TelnetAppender::acceptConnections(log4cxx_thread_t* /* thread */, void* data) { TelnetAppender* pThis = (TelnetAppender*) data; // main loop; is left when This->closed is != 0 after an accept() Modified: logging/log4cxx/trunk/src/threadpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/threadpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/threadpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/threadpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -32,7 +32,7 @@ } PatternConverterPtr ThreadPatternConverter::newInstance( - const std::vector<LogString>& options) { + const std::vector<LogString>& /* options */) { static PatternConverterPtr def(new ThreadPatternConverter()); return def; } @@ -40,7 +40,7 @@ void ThreadPatternConverter::format( const LoggingEventPtr& event, LogString& toAppendTo, - Pool& p) const { + Pool& /* p */) const { toAppendTo.append(event->getThreadName()); } Modified: logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp (original) +++ logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp Mon Jul 17 12:45:12 2006 @@ -46,9 +46,9 @@ } void ThrowableInformationPatternConverter::format( - const LoggingEventPtr& event, - LogString& toAppendTo, - Pool& p) const { + const LoggingEventPtr& /* event */, + LogString& /* toAppendTo */, + Pool& /* p */) const { } /** Modified: logging/log4cxx/trunk/src/timebasedrollingpolicy.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/timebasedrollingpolicy.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/timebasedrollingpolicy.cpp (original) +++ logging/log4cxx/trunk/src/timebasedrollingpolicy.cpp Mon Jul 17 12:45:12 2006 @@ -181,9 +181,9 @@ bool TimeBasedRollingPolicy::isTriggeringEvent( - Appender* appender, - const log4cxx::spi::LoggingEventPtr& event, - const LogString& filename, - size_t fileLength) { + Appender* /* appender */, + const log4cxx::spi::LoggingEventPtr& /* event */, + const LogString& /* filename */, + size_t /* fileLength */) { return apr_time_now() > nextCheck; } Modified: logging/log4cxx/trunk/src/unicodehelper.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/unicodehelper.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/unicodehelper.cpp (original) +++ logging/log4cxx/trunk/src/unicodehelper.cpp Mon Jul 17 12:45:12 2006 @@ -146,7 +146,7 @@ return 1; } -unsigned int UnicodeHelper::decodeWide(const wchar_t*& src, const wchar_t* srcEnd) { +unsigned int UnicodeHelper::decodeWide(const wchar_t*& src, const wchar_t* /* srcEnd */) { return *(src++); } Modified: logging/log4cxx/trunk/src/xmlsocketappender.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/xmlsocketappender.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/src/xmlsocketappender.cpp (original) +++ logging/log4cxx/trunk/src/xmlsocketappender.cpp Mon Jul 17 12:45:12 2006 @@ -78,7 +78,7 @@ void XMLSocketAppender::renderEvent(const spi::LoggingEventPtr& event, - helpers::SocketOutputStreamPtr& os1, Pool& p) + helpers::SocketOutputStreamPtr& /*os1*/, Pool& p) { LogString output; Modified: logging/log4cxx/trunk/tests/src/filetestcase.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/filetestcase.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/tests/src/filetestcase.cpp (original) +++ logging/log4cxx/trunk/tests/src/filetestcase.cpp Mon Jul 17 12:45:12 2006 @@ -123,7 +123,7 @@ } void fileWrite1() { - OutputStreamPtr fos = + OutputStreamPtr fos = new FileOutputStream(LOG4CXX_STR("output/fileWrite1.txt")); OutputStreamWriterPtr osw = new OutputStreamWriter(fos); @@ -131,7 +131,7 @@ LogString greeting(LOG4CXX_STR("Hello, World") LOG4CXX_EOL); osw->write(greeting, pool); - InputStreamPtr is = + InputStreamPtr is = new FileInputStream(LOG4CXX_STR("output/fileWrite1.txt")); InputStreamReaderPtr isr = new InputStreamReader(is); LogString reply = isr->read(pool); @@ -140,13 +140,13 @@ } /** - * Tests conversion of backslash containing file names. - * Would cause infinite loop due to bug LOGCXX-105. + * Tests conversion of backslash containing file names. + * Would cause infinite loop due to bug LOGCXX-105. */ void deleteBackslashedFileName() { File file("output\\bogus.txt"); Pool pool; - bool deleted = file.deleteFile(pool); + /*bool deleted = */file.deleteFile(pool); } }; Modified: logging/log4cxx/trunk/tests/src/loggertestcase.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/loggertestcase.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/tests/src/loggertestcase.cpp (original) +++ logging/log4cxx/trunk/tests/src/loggertestcase.cpp Mon Jul 17 12:45:12 2006 @@ -49,7 +49,7 @@ void close() {} - void append(const spi::LoggingEventPtr& event, Pool& p) + void append(const spi::LoggingEventPtr& /*event*/, Pool& /*p*/) { counter++; } bool requiresLayout() const Modified: logging/log4cxx/trunk/tests/src/rolling/filenamepatterntestcase.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/rolling/filenamepatterntestcase.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/tests/src/rolling/filenamepatterntestcase.cpp (original) +++ logging/log4cxx/trunk/tests/src/rolling/filenamepatterntestcase.cpp Mon Jul 17 12:45:12 2006 @@ -100,7 +100,7 @@ tm.tm_mon = month; tm.tm_year = year - 1900; apr_time_t n; - apr_status_t stat = apr_time_exp_get(&n, &tm); + /*apr_status_t stat = */apr_time_exp_get(&n, &tm); ObjectPtr obj(new Date(n)); CPPUNIT_ASSERT_EQUAL(expected, format(pattern, obj)); } Modified: logging/log4cxx/trunk/tests/src/util/compare.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/util/compare.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/tests/src/util/compare.cpp (original) +++ logging/log4cxx/trunk/tests/src/util/compare.cpp Mon Jul 17 12:45:12 2006 @@ -133,7 +133,7 @@ } } -bool Compare::gzCompare(const File& file1, const File& file2) +bool Compare::gzCompare(const File& /*file1*/, const File& /*file2*/) { return false; } Modified: logging/log4cxx/trunk/tests/src/util/xmlfilenamefilter.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/util/xmlfilenamefilter.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/tests/src/util/xmlfilenamefilter.cpp (original) +++ logging/log4cxx/trunk/tests/src/util/xmlfilenamefilter.cpp Mon Jul 17 12:45:12 2006 @@ -19,7 +19,7 @@ using namespace log4cxx; using namespace log4cxx::helpers; -XMLFilenameFilter::XMLFilenameFilter(const std::string& actual, const std::string& expected) { +XMLFilenameFilter::XMLFilenameFilter(const std::string& /*actual*/, const std::string& expected) { std::string pattern(" file=\\(.\\).*"); pattern += expected; Modified: logging/log4cxx/trunk/tests/src/vectorappender.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/vectorappender.cpp?rev=422815&r1=422814&r2=422815&view=diff ============================================================================== --- logging/log4cxx/trunk/tests/src/vectorappender.cpp (original) +++ logging/log4cxx/trunk/tests/src/vectorappender.cpp Mon Jul 17 12:45:12 2006 @@ -22,7 +22,7 @@ IMPLEMENT_LOG4CXX_OBJECT(VectorAppender) -void VectorAppender::append(const spi::LoggingEventPtr& event, Pool& p) +void VectorAppender::append(const spi::LoggingEventPtr& event, Pool& /*p*/) { try {