Rename Syslog (util/Syslog.*) to SystemLog (util/SystemLog.*) to prevent

case-insensitive clashes with system headers (syslog.h).

See Bug 369

diff --git a/distrules b/distrules
index b032b5e98f57e507d699daba2af75025b8007d45..7a80c44dee9282da467c080ed4c5a3704beec2e2 100644 (file)
--- a/distrules
+++ b/distrules
@@ -299,7 +299,7 @@ HYLAFAXSRC=\
        util/StrArray.c++                       \
        util/StrDict.c++                        \
        util/Sys.c++                            \
-       util/Syslog.c++                         \
+       util/SystemLog.c++                      \
        util/TextFmt.c++                        \
        util/TimeOfDay.c++                      \
        util/Timeout.c++                        \
@@ -340,7 +340,7 @@ HYLAFAXSRC=\
        util/StrArray.h                         \
        util/StrDict.h                          \
        util/Sys.h                              \
-       util/Syslog.h                           \
+       util/SystemLog.h                        \
        util/TextFmt.h                          \
        util/TimeOfDay.h                        \
        util/Timeout.h                          \

diff --git a/faxd/faxApp.h b/faxd/faxApp.h
index 98fe113a36dbd64f5b0c70f675ed789d285c82ad..8097da4ceb2c656aec9ea1961aa7dc3bb426cb0f 100644 (file)
--- a/faxd/faxApp.h
+++ b/faxd/faxApp.h
@@ -29,11 +29,11 @@
  * HylaFAX Application Support.
  */
 #include "Str.h"
-#include "Syslog.h"
+#include "SystemLog.h"
 #include "Dispatcher.h"
 #include <stdarg.h>
 
-class faxApp : public Syslog {
+class faxApp : public SystemLog {
 private:
     static fxStr getopts;              // main arguments
 

diff --git a/hfaxd/HylaFAXServer.h b/hfaxd/HylaFAXServer.h
index 36c9ed84d14bac029aa0cdae1c6ab85c461f841e..b93e97cbb00feb17e74c041f9def264284f914f9 100644 (file)
--- a/hfaxd/HylaFAXServer.h
+++ b/hfaxd/HylaFAXServer.h
@@ -36,7 +36,7 @@
 #include "FileCache.h"
 #include "Trace.h"
 #include "Trigger.h"
-#include "Syslog.h"
+#include "SystemLog.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -150,7 +150,7 @@ extern const char* fmtTime(time_t t);
 /*
  * An instance of a fax server process.
  */
-class HylaFAXServer : public Syslog, public FaxConfig, public IOHandler {
+class HylaFAXServer : public SystemLog, public FaxConfig, public IOHandler {
 public:
     struct stringtag {
         const char*     name;

diff --git a/util/Makefile.in b/util/Makefile.in
index c8c890817f21374d86dc2f98e3d0b9e565e68297..4c28dcf1d7e1ee8ee1bf6c5e99e6802c31ce9412 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -59,7 +59,7 @@ C++FILES=Array.c++ \
        Dispatcher.c++ \
        IOHandler.c++ \
        Sys.c++ \
-       Syslog.c++ \
+       SystemLog.c++ \
        Timeout.c++ \
        Fatal.c++ \
        \

diff --git a/util/Syslog.c++ b/util/SystemLog.c++
similarity index 80%
rename from util/Syslog.c++
rename to util/SystemLog.c++
index db83dd04b9f258dc56106e99b83440c5eb286e67..7e50445ac24842bb591b60a9cfaaee8042aef6d6 100644 (file)
--- a/util/Syslog.c++
+++ b/util/SystemLog.c++
@@ -25,7 +25,7 @@
  */
 #include "port.h"
 #include "config.h"
-#include "Syslog.h"
+#include "SystemLog.h"
 
 /*
  * Logging and error routines.
@@ -33,32 +33,32 @@
 
 extern "C" int cvtFacility(const char*, int*);
 
-int    Syslog::facility = LOG_DAEMON;
-const char* Syslog::appName = "FaxApp";                // generic, override
+int    SystemLog::facility = LOG_DAEMON;
+const char* SystemLog::appName = "FaxApp";             // generic, override
 
 void
-Syslog::setupLogging(const char* name)
+SystemLog::setupLogging(const char* name)
 {
     appName = name;
     openlog(name, LOG_PID|LOG_ODELAY, facility);
 }
 void
-Syslog::setupLogging(void)
+SystemLog::setupLogging(void)
 {
     // NB: LOG_NDELAY 'cuz of chroot done by hfaxd
     openlog(appName, LOG_PID|LOG_NDELAY, facility);
 }
-void Syslog::closeLogging(void) { closelog(); }
+void SystemLog::closeLogging(void) { closelog(); }
 
 void
-Syslog::setLogFacility(const char* fac)
+SystemLog::setLogFacility(const char* fac)
 {
     if (!cvtFacility(fac, &facility))
        logError("Unknown syslog facility name \"%s\"", fac);
 }
 
 void vlogInfo(const char* fmt, va_list ap)
-    { vsyslog(LOG_INFO|Syslog::getLogFacility(), fmt, ap); }
+    { vsyslog(LOG_INFO|SystemLog::getLogFacility(), fmt, ap); }
 void
 logInfo(const char* fmt ...)
 {
@@ -69,7 +69,7 @@ logInfo(const char* fmt ...)
 }
 
 void vlogError(const char* fmt, va_list ap)
-    { vsyslog(LOG_ERR|Syslog::getLogFacility(), fmt, ap); }
+    { vsyslog(LOG_ERR|SystemLog::getLogFacility(), fmt, ap); }
 void
 logError(const char* fmt ...)
 {
@@ -80,7 +80,7 @@ logError(const char* fmt ...)
 }
 
 void vlogNotice(const char* fmt, va_list ap)
-    { vsyslog(LOG_NOTICE|Syslog::getLogFacility(), fmt, ap); }
+    { vsyslog(LOG_NOTICE|SystemLog::getLogFacility(), fmt, ap); }
 void
 logNotice(const char* fmt ...)
 {
@@ -91,7 +91,7 @@ logNotice(const char* fmt ...)
 }
 
 void vlogDebug(const char* fmt, va_list ap)
-    { vsyslog(LOG_DEBUG|Syslog::getLogFacility(), fmt, ap); }
+    { vsyslog(LOG_DEBUG|SystemLog::getLogFacility(), fmt, ap); }
 void
 logDebug(const char* fmt ...)
 {
@@ -102,7 +102,7 @@ logDebug(const char* fmt ...)
 }
 
 void vlogWarning(const char* fmt, va_list ap)
-    { vsyslog(LOG_WARNING|Syslog::getLogFacility(), fmt, ap); }
+    { vsyslog(LOG_WARNING|SystemLog::getLogFacility(), fmt, ap); }
 void
 logWarning(const char* fmt ...)
 {

diff --git a/util/Syslog.h b/util/SystemLog.h
similarity index 92%
rename from util/Syslog.h
rename to util/SystemLog.h
index 425ed8aaafe084eee398791c937c2e87eed6ee31..f230f05495ad8b9a92e72415fb2edd306801f0f5 100644 (file)
--- a/util/Syslog.h
+++ b/util/SystemLog.h
@@ -23,17 +23,18 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-#ifndef _Syslog_
-#define        _Syslog_
+#ifndef _SystemLog_
+#define        _SystemLog_
 /*
- * Syslog Support.
+ * SystemLog Support.
  */
 #include <stdarg.h>
 extern "C" {
 #include <syslog.h>
 }
 
-struct Syslog {
+class SystemLog {
+public:
     static int facility;               // syslog facility
     static const char* appName;                // app name for syslog messages
 
@@ -43,7 +44,7 @@ struct Syslog {
     static void setLogFacility(const char* facility);
     static int getLogFacility(void);
 };
-inline int Syslog::getLogFacility(void)                { return facility; }
+inline int SystemLog::getLogFacility(void)             { return facility; }
 
 extern void logError(const char* fmt ...);
 extern void logInfo(const char* fmt ...);
@@ -55,4 +56,4 @@ extern        void vlogInfo(const char* fmt, va_list ap);
 extern void vlogNotice(const char* fmt, va_list ap);
 extern void vlogDebug(const char* fmt, va_list ap);
 extern void vlogWarning(const char* fmt, va_list ap);
-#endif /* _Syslog_ */
+#endif /* _SystemLog_ */