ChangeLogTag:Fri May 17 07:32:49 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

10 files changed, 64 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ed1d30a211..ef8068a7631 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Fri May 17 07:32:49 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/Log_Msg.cpp: Replaced ACE_NEW_RETURN_I with ACE_NEW_RETURN.
+	  Thanks to Johnny Willemsen for reporting this.
+
+Thu May 16 20:15:36 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.i: Added ACE_HAS_ISASTREAM_PROTO guard around the
+	  extern "C" int isastream() method.  Thanks to Oleg Terletsky
+ 	  <oterletsky@comcast.net> for reporting this.
+
+	* ace/ARGV.h: Added a comment that points out the "add()" method
+	  doesn't handle memory management.  Thanks to Kyle Brost
+ 	  <kyle.brost@quest.com> and Don Hinton for clarifying this.
+
 Thu May 16 17:05:19 2002  Ossama Othman  <ossama@uci.edu>
 
 	* ace/SSL/SSL_Connector.cpp (handle_input, handle_output):
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 2ed1d30a211..ef8068a7631 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Fri May 17 07:32:49 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/Log_Msg.cpp: Replaced ACE_NEW_RETURN_I with ACE_NEW_RETURN.
+	  Thanks to Johnny Willemsen for reporting this.
+
+Thu May 16 20:15:36 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.i: Added ACE_HAS_ISASTREAM_PROTO guard around the
+	  extern "C" int isastream() method.  Thanks to Oleg Terletsky
+ 	  <oterletsky@comcast.net> for reporting this.
+
+	* ace/ARGV.h: Added a comment that points out the "add()" method
+	  doesn't handle memory management.  Thanks to Kyle Brost
+ 	  <kyle.brost@quest.com> and Don Hinton for clarifying this.
+
 Thu May 16 17:05:19 2002  Ossama Othman  <ossama@uci.edu>
 
 	* ace/SSL/SSL_Connector.cpp (handle_input, handle_output):
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 2ed1d30a211..ef8068a7631 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,18 @@
+Fri May 17 07:32:49 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/Log_Msg.cpp: Replaced ACE_NEW_RETURN_I with ACE_NEW_RETURN.
+	  Thanks to Johnny Willemsen for reporting this.
+
+Thu May 16 20:15:36 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.i: Added ACE_HAS_ISASTREAM_PROTO guard around the
+	  extern "C" int isastream() method.  Thanks to Oleg Terletsky
+ 	  <oterletsky@comcast.net> for reporting this.
+
+	* ace/ARGV.h: Added a comment that points out the "add()" method
+	  doesn't handle memory management.  Thanks to Kyle Brost
+ 	  <kyle.brost@quest.com> and Don Hinton for clarifying this.
+
 Thu May 16 17:05:19 2002  Ossama Othman  <ossama@uci.edu>
 
 	* ace/SSL/SSL_Connector.cpp (handle_input, handle_output):
diff --git a/THANKS b/THANKS
index 14b15463d57..2ec0e724ad3 100644
--- a/THANKS
+++ b/THANKS
@@ -293,7 +293,7 @@ Michael McKnight <mcknight@signalsoftcorp.com>
 Huiying Shen <shen@environ.org>
 Alex Chan <Alex.Chan@Aspect.com>
 Aaron Valdivia <avaldivia@hns.com>
-Edan Ayal <edan@bandwiz.com>
+Edan Ayal <edanayal@yahoo.com>
 Jeffrey Peterson <jpeterson@fallschurch.esys.com>
 Neil Lavelle <nlavelle@imcl.com>
 Steven Wohlever <wohlever@mitre.org>
@@ -1514,6 +1514,7 @@ Peter Kullmann <P.Kullmann@rog.de>
 Lyn Headley <headley@wolve.com>
 Jeff Adams <Jeff.Adams@gd-ais.com>
 Timothy Culp <timothy.culp@computer.org>
+Oleg Terletsky <oterletsky@comcast.net>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 1f5372b3811..9ed50af498b 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -2904,7 +2904,7 @@ ACE::daemonize (const ACE_TCHAR pathname[],
 
   ACE_OS::umask (0); // clear our file mode creation mask.
 
-  // Close down the files.
+  // Close down the I/O handles.
   if (close_all_handles)
     for (int i = ACE::max_handles () - 1; i >= 0; i--)
       ACE_OS::close (i);
diff --git a/ace/ARGV.h b/ace/ARGV.h
index eb15a3da12e..cbb1f9a3f8a 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  @author Doug Schmidt <schmidt@cs.wustl.edu>
- *  @author Everett Anderson
+ *  @author Everett Anderson <eea1@cs.wustl.edu>
  */
 //==========================================================================
 
@@ -101,8 +101,10 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
   /// Add another argument.  This only works in the <ITERATIVE> state.
-  /// Note that this method does not copy <next_arg>, but instead
-  /// assumes ownership of it.  Returns -1 on failure and 0 on success.
+  /// Note that this method does not copy <next_arg>, nor does it 
+  /// assume ownership of managing its memory, i.e., the caller is
+  /// responsible for memory management.  Returns -1 on failure and 0
+  /// on success.  
   int add (const ACE_TCHAR *next_arg);
 
   /**
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index c72ba730fae..48c761623d8 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -48,14 +48,6 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg)
 #  define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_IPC
 #endif /* ! ACE_WIN32 */
 
-// This is only needed here because we can't afford to call
-// ACE_LOG_MSG->instance() from within ACE_Log_Msg::instance() or else
-// we will recurse infinitely!  Not for public use!
-#define ACE_NEW_RETURN_I(POINTER,CONSTRUCTOR,RET_VAL) \
-   do { POINTER = new CONSTRUCTOR; \
-     if (POINTER == 0) { errno = ENOMEM; return RET_VAL; } \
-     } while (0)
-
 // Instance count for Log_Msg - used to know when dynamically
 // allocated storage (program name and host name) can be safely
 // deleted.
@@ -170,9 +162,9 @@ ACE_Log_Msg_Manager::get_lock (void)
     {
       ACE_NO_HEAP_CHECK;
 
-      ACE_NEW_RETURN_I (ACE_Log_Msg_Manager::lock_,
-                        ACE_Recursive_Thread_Mutex,
-                        0);
+      ACE_NEW_RETURN (ACE_Log_Msg_Manager::lock_,
+                      ACE_Recursive_Thread_Mutex,
+                      0);
     }
 
   if (init_backend () == -1)
@@ -327,9 +319,9 @@ ACE_Log_Msg::instance (void)
       {
         ACE_NO_HEAP_CHECK;
 
-        ACE_NEW_RETURN_I (tss_log_msg,
-                          ACE_Log_Msg,
-                          0);
+        ACE_NEW_RETURN (tss_log_msg,
+                        ACE_Log_Msg,
+                        0);
         // Store the dynamically allocated pointer in thread-specific
         // storage.  It gets deleted via the ACE_TSS_cleanup function
         // when the thread terminates.
diff --git a/ace/OS.i b/ace/OS.i
index 8b65ed330f9..739bef79d9d 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -256,7 +256,10 @@ ACE_OS::mkfifo (const ACE_TCHAR *file, mode_t mode)
 
 // These prototypes are chronically lacking from many versions of
 // UNIX.
+#if !defined (ACE_HAS_ISASTREAM_PROTO)
 extern "C" int isastream (int);
+#endif /* ACE_HAS_ISASTREAM_PROTO */
+
 # if !defined (ACE_HAS_GETRUSAGE_PROTO)
 extern "C" int getrusage (int who, struct rusage *rusage);
 # endif /* ! ACE_HAS_GETRUSAGE_PROTO */
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index 7e62bd9724a..c49a0fe2211 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -6,11 +6,10 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef ACE_TIME_VALUE_H
 #define ACE_TIME_VALUE_H
 
diff --git a/ace/config-all.h b/ace/config-all.h
index 62fadf96134..94082ac193d 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -409,7 +409,7 @@
 
 #  if defined (ACE_HAS_NEW_NOTHROW)
 #    define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \
-   do { POINTER = new(ACE_nothrow) CONSTRUCTOR; \
+   do { POINTER = new (ACE_nothrow) CONSTRUCTOR; \
      if (POINTER == 0) { errno = ENOMEM; return RET_VAL; } \
    } while (0)
 #    define ACE_NEW(POINTER,CONSTRUCTOR) \