NewListener(): Code cleanup

[ngircd-alex.git] / src / ngircd / log.c

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 6f0c4c9db1129d3a2cc291d6d3811fd297591ebb..375f4bc1f6ab605ecbfe659367c82812b981a1a0 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -80,9 +80,9 @@ Log_Init(bool Daemon_Mode)
 #define LOG_CONS 0
 #endif
 #ifdef LOG_DAEMON
-       openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_DAEMON);
+       openlog(PACKAGE, LOG_CONS|LOG_PID, LOG_DAEMON);
 #else
-       openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, 0);
+       openlog(PACKAGE, LOG_CONS|LOG_PID, 0);
 #endif
 #endif
 } /* Log_Init */
@@ -99,7 +99,7 @@ Log_ReInit(void)
 #define LOG_CONS 0
 #endif
        closelog();
-       openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility);
+       openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility);
 #endif
        Log(LOG_NOTICE, "%s started.", NGIRCd_Version);
        Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile);
@@ -109,8 +109,9 @@ Log_ReInit(void)
 GLOBAL void
 Log_Exit( void )
 {
-       Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME,
-           NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted());
+       Log(LOG_NOTICE, "%s done%s, served %lu connection%s.", PACKAGE_NAME,
+           NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted(),
+           Conn_CountAccepted() == 1 ? "" : "s");
 #ifdef SYSLOG
        closelog();
 #endif
@@ -218,7 +219,7 @@ GLOBAL void
 Log_Init_Subprocess(char UNUSED *Name)
 {
 #ifdef SYSLOG
-       openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility);
+       openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility);
 #endif
 #ifdef DEBUG
        Log_Subprocess(LOG_DEBUG, "%s sub-process starting, PID %ld.",