ChangeLogTag:Sun Jul 15 11:06:33 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

6 files changed, 27 insertions, 108 deletions

diff --git a/ChangeLog b/ChangeLog
index 5155c28b305..703ff64adb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul 15 11:06:33 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Log_Msg_NT_Event_Log.cpp: Fixed the implementation so that
+	  it's consistent with the new program_name() features.  Thanks to
+ 	  Chris Kohloff <chris@kohlhoff.com> for this fix.
+
 Sun Jul 15 11:04:26 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/SSL/ACE_SSL.dsp:
@@ -536,37 +542,10 @@ Fri Jul  6 08:36:20 2001  Chad Elliott  <elliott_c@ociweb.com>
           contain Other.  The netsvcs library requires Naming_Context.
 
 Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-=======
-
-=======
-
->>>>>>> 4.2263
+  
         * ace/Makefile (LOGGING_FILES): Added support for
           Log_Msg_UNIX_Syslog.
->>>>>>> 4.2247
-=======
->>>>>>> 4.2257
-
-<<<<<<< ChangeLog
-        * ace/Makefile (LOGGING_FILES): Added support for
-          Log_Msg_UNIX_Syslog.
-
-        * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
-        * ace/Log_Msg.cpp,
-        * ace/OS.h: Added support for a new UNIX syslog backend for the
-          ACE_Log_Msg class.  Thanks to Jerry D. De Master
-          <jdemaster@rite-solutions.com> and Robert Davidson
-          <robert@rdavidson.freeserve.co.uk>.
 
-        * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
-          comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
-          reporting this.
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-=======
         * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
         * ace/Log_Msg.cpp,
         * ace/OS.h: Added support for a new UNIX syslog backend for the
@@ -577,13 +556,7 @@ Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
         * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
           comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
           reporting this.
->>>>>>> 4.2247
-=======
->>>>>>> 4.2257
-
-=======
 
->>>>>>> 4.2263
         * ace/config-macosx.h: Added a new file courtesy of John
           Zorko so that things will work on MacOSX.
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 5155c28b305..703ff64adb1 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Sun Jul 15 11:06:33 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Log_Msg_NT_Event_Log.cpp: Fixed the implementation so that
+	  it's consistent with the new program_name() features.  Thanks to
+ 	  Chris Kohloff <chris@kohlhoff.com> for this fix.
+
 Sun Jul 15 11:04:26 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/SSL/ACE_SSL.dsp:
@@ -536,37 +542,10 @@ Fri Jul  6 08:36:20 2001  Chad Elliott  <elliott_c@ociweb.com>
           contain Other.  The netsvcs library requires Naming_Context.
 
 Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-=======
-
-=======
-
->>>>>>> 4.2263
+  
         * ace/Makefile (LOGGING_FILES): Added support for
           Log_Msg_UNIX_Syslog.
->>>>>>> 4.2247
-=======
->>>>>>> 4.2257
-
-<<<<<<< ChangeLog
-        * ace/Makefile (LOGGING_FILES): Added support for
-          Log_Msg_UNIX_Syslog.
-
-        * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
-        * ace/Log_Msg.cpp,
-        * ace/OS.h: Added support for a new UNIX syslog backend for the
-          ACE_Log_Msg class.  Thanks to Jerry D. De Master
-          <jdemaster@rite-solutions.com> and Robert Davidson
-          <robert@rdavidson.freeserve.co.uk>.
 
-        * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
-          comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
-          reporting this.
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-=======
         * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
         * ace/Log_Msg.cpp,
         * ace/OS.h: Added support for a new UNIX syslog backend for the
@@ -577,13 +556,7 @@ Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
         * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
           comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
           reporting this.
->>>>>>> 4.2247
-=======
->>>>>>> 4.2257
-
-=======
 
->>>>>>> 4.2263
         * ace/config-macosx.h: Added a new file courtesy of John
           Zorko so that things will work on MacOSX.
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 5155c28b305..703ff64adb1 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Sun Jul 15 11:06:33 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Log_Msg_NT_Event_Log.cpp: Fixed the implementation so that
+	  it's consistent with the new program_name() features.  Thanks to
+ 	  Chris Kohloff <chris@kohlhoff.com> for this fix.
+
 Sun Jul 15 11:04:26 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/SSL/ACE_SSL.dsp:
@@ -536,37 +542,10 @@ Fri Jul  6 08:36:20 2001  Chad Elliott  <elliott_c@ociweb.com>
           contain Other.  The netsvcs library requires Naming_Context.
 
 Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-=======
-
-=======
-
->>>>>>> 4.2263
+  
         * ace/Makefile (LOGGING_FILES): Added support for
           Log_Msg_UNIX_Syslog.
->>>>>>> 4.2247
-=======
->>>>>>> 4.2257
-
-<<<<<<< ChangeLog
-        * ace/Makefile (LOGGING_FILES): Added support for
-          Log_Msg_UNIX_Syslog.
-
-        * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
-        * ace/Log_Msg.cpp,
-        * ace/OS.h: Added support for a new UNIX syslog backend for the
-          ACE_Log_Msg class.  Thanks to Jerry D. De Master
-          <jdemaster@rite-solutions.com> and Robert Davidson
-          <robert@rdavidson.freeserve.co.uk>.
 
-        * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
-          comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
-          reporting this.
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-=======
         * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
         * ace/Log_Msg.cpp,
         * ace/OS.h: Added support for a new UNIX syslog backend for the
@@ -577,13 +556,7 @@ Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
         * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
           comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
           reporting this.
->>>>>>> 4.2247
-=======
->>>>>>> 4.2257
-
-=======
 
->>>>>>> 4.2263
         * ace/config-macosx.h: Added a new file courtesy of John
           Zorko so that things will work on MacOSX.
 
diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index 7dff63fb650..6bdd58c1a80 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_HANDLE_SET_H
 #define ACE_HANDLE_SET_H
 #include "ace/pre.h"
diff --git a/ace/Log_Msg_NT_Event_Log.cpp b/ace/Log_Msg_NT_Event_Log.cpp
index 6a1375c0318..663465bfe23 100644
--- a/ace/Log_Msg_NT_Event_Log.cpp
+++ b/ace/Log_Msg_NT_Event_Log.cpp
@@ -5,6 +5,7 @@
 #if defined (ACE_WIN32)
 
 #include "ace/Log_Msg_NT_Event_Log.h"
+#include "ace/Log_Msg.h"
 #include "ace/Log_Record.h"
 
 ACE_RCSID(ace, Log_Msg_NT_Event_Log, "$Id$")
@@ -22,6 +23,7 @@ ACE_Log_Msg_NT_Event_Log::~ACE_Log_Msg_NT_Event_Log (void)
 int
 ACE_Log_Msg_NT_Event_Log::open (const ACE_TCHAR *logger_key)
 {
+  ACE_UNUSED_ARG (logger_key);
   // ACE's "resource module" contains the message resource required
   // for event logging.
   ACE_TCHAR msg_file [MAXPATHLEN];
@@ -33,13 +35,13 @@ ACE_Log_Msg_NT_Event_Log::open (const ACE_TCHAR *logger_key)
   int msg_file_length = ACE_OS::strlen (msg_file);
 
   // Information is stored in the registry at a location based on the
-  // logger_key.
+  // program name.
   ACE_TCHAR reg_key [MAXPATHLEN];
   ACE_OS::strcpy (reg_key,
                   ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\"));
   int reg_key_length = ACE_OS::strlen(reg_key);
   ACE_OS::strncat (reg_key,
-                   logger_key,
+                   ACE_Log_Msg::program_name (),
                    MAXPATHLEN - reg_key_length);
 
   // Add the event source to the registry. Note that if this fails it
@@ -65,7 +67,7 @@ ACE_Log_Msg_NT_Event_Log::open (const ACE_TCHAR *logger_key)
   RegCloseKey (hkey);
 
   // Obtain a handle to the event source.
-  this->evlog_handle_ = ACE_TEXT_RegisterEventSource (0, logger_key);
+  this->evlog_handle_ = ACE_TEXT_RegisterEventSource (0, ACE_Log_Msg::program_name ());
   return this->evlog_handle_ ? 0 : -1;
 }
 
diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h
index 185f8ae6ce2..6738b250dc5 100644
--- a/ace/SOCK_Stream.h
+++ b/ace/SOCK_Stream.h
@@ -6,11 +6,10 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef ACE_SOCK_STREAM_H
 #define ACE_SOCK_STREAM_H
 #include "ace/pre.h"