You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/05/10 00:16:00 UTC

svn commit: r654960 - in /logging/log4cxx/trunk/src: changes/changes.xml main/cpp/syslogappender.cpp

Author: carnold
Date: Fri May  9 15:16:00 2008
New Revision: 654960

URL: http://svn.apache.org/viewvc?rev=654960&view=rev
Log:
LOGCXX-283: Suspicious, but harmless, reuse of LOCAL1 in SyslogAppender::getFacility

Modified:
    logging/log4cxx/trunk/src/changes/changes.xml
    logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp

Modified: logging/log4cxx/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/changes/changes.xml?rev=654960&r1=654959&r2=654960&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/changes/changes.xml (original)
+++ logging/log4cxx/trunk/src/changes/changes.xml Fri May  9 15:16:00 2008
@@ -35,6 +35,7 @@
 <action issue="LOGCXX-278">Threads for reconnecting sockets do not end cleanly when program exits</action>
 <action issue="LOGCXX-280">tests and sample code unnecessarily compiled during default make target</action>
 <action issue="LOGCXX-281">Sun Studio 11 reports function hides base virtual function warning</action>
+<action issue="LOGCXX-283">Suspicious, but harmless, reuse of LOCAL1 in SyslogAppender</action>
 </release>
 <release version="0.10.0" date="2008-04-03" description="First Apache release">
 <action issue="LOGCXX-2">logger.h includes config.h</action>

Modified: logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp?rev=654960&r1=654959&r2=654960&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp Fri May  9 15:16:00 2008
@@ -223,27 +223,27 @@
         {
                 return LOG_LOCAL1;
         }
-        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL1"), LOG4CXX_STR("local2")))
+        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL2"), LOG4CXX_STR("local2")))
         {
                 return LOG_LOCAL2;
         }
-        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL1"), LOG4CXX_STR("local3")))
+        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL3"), LOG4CXX_STR("local3")))
         {
                 return LOG_LOCAL3;
         }
-        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL1"), LOG4CXX_STR("local4")))
+        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL4"), LOG4CXX_STR("local4")))
         {
                 return LOG_LOCAL4;
         }
-        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL1"), LOG4CXX_STR("local5")))
+        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL5"), LOG4CXX_STR("local5")))
         {
                 return LOG_LOCAL5;
         }
-        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL1"), LOG4CXX_STR("local6")))
+        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL6"), LOG4CXX_STR("local6")))
         {
                 return LOG_LOCAL6;
         }
-        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL1"), LOG4CXX_STR("local7")))
+        else if (StringHelper::equalsIgnoreCase(s, LOG4CXX_STR("LOCAL7"), LOG4CXX_STR("local7")))
         {
                 return LOG_LOCAL7;
         }