Imported Upstream version 6.4+svn4214

[mirror_smartmontools-debian.git] / os_win32 / syslog_win32.cpp

diff --git a/os_win32/syslog_win32.cpp b/os_win32/syslog_win32.cpp
index 4a15c3738edd5a35bfbb74ea519661287c8d60ad..57e14e6c3de487c48f0181a1449078cdd9dce0f7 100644 (file)
--- a/os_win32/syslog_win32.cpp
+++ b/os_win32/syslog_win32.cpp
@@ -1,9 +1,9 @@
 /*
  * os_win32/syslog_win32.cpp
  *
- * Home page of code is: http://smartmontools.sourceforge.net
+ * Home page of code is: http://www.smartmontools.org
  *
- * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-15 Christian Franke
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -11,15 +11,13 @@
  * any later version.
  *
  * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 // Win32 Emulation of syslog() for smartd
 // Writes to windows event log on NT4/2000/XP
 // (Register syslogevt.exe as event message file)
-// Writes to file "<ident>.log" on 9x/ME.
 // If facility is set to LOG_LOCAL[0-7], log is written to
 // file "<ident>.log", stdout, stderr, "<ident>[1-5].log".
 
@@ -35,8 +33,8 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h> // RegisterEventSourceA(), ReportEventA(), ...
 
-const char *syslog_win32_c_cvsid = "$Id: syslog_win32.cpp,v 1.7 2006/08/09 20:40:20 chrfranke Exp $"
-SYSLOG_H_CVSID;
+const char *syslog_win32_cpp_cvsid = "$Id: syslog_win32.cpp 4149 2015-10-17 15:38:01Z chrfranke $"
+  SYSLOG_H_CVSID;
 
 #ifdef _MSC_VER
 // MSVC
@@ -350,12 +348,8 @@ void openlog(const char *ident, int logopt, int facility)
                // Cannot open => Use logfile
                long err = GetLastError();
                strcat(strcpy(sl_logpath, sl_ident), ".log");
-               if (GetVersion() & 0x80000000)
-                       fprintf(stderr, "%s: No event log on Win9x/ME, writing to %s\n",
-                               sl_ident, sl_logpath);
-               else
-                       fprintf(stderr, "%s: Cannot register event source (Error=%ld), writing to %s\n",
-                               sl_ident, err, sl_logpath);
+               fprintf(stderr, "%s: Cannot register event source (Error=%ld), writing to %s\n",
+                       sl_ident, err, sl_logpath);
        }
        else {
                // Start event log thread
@@ -426,7 +420,7 @@ int main(int argc, char* argv[])
                if (i % 13 == 0)
                        Sleep(1000L);
                sprintf(buf, "Log Line %d\n", i);
-               syslog(i % 17 ? LOG_INFO : LOG_ERR, buf);
+               syslog((i % 17) ? LOG_INFO : LOG_ERR, buf);
        }
        closelog();
        return 0;