*** empty log message ***

3 files changed, 23 insertions, 3 deletions

diff --git a/ChangeLog-98a b/ChangeLog-98a
index 9620856a495..4111fcd776b 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,3 +1,17 @@
+Wed Apr 15 16:25:38 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/WFMO_Reactor.cpp (handle_signal): Changed break to return 0.
+
+	* ace/OS.cpp (uname): We have to make sure that the size of
+ 	  (processor + subtype) is not greater than the size of
+ 	  name->machine.  So we give half the space to the processor and
+ 	  half the space to subtype.  The -1 is necessary for because of
+ 	  the space between processor and subtype in the machine name.
+
+	  Thanks to Andrew Marchewka
+ 	  (Andrew_Marchewka@SRT.CCMAIL.compuserve.com) for suggesting
+ 	  these changes.
+
 Wed Apr 15 08:52:52 1998  David L. Levine  <levine@cs.wustl.edu>
 
         * tests/Reactor_Exceptions_Test (handle_input): removed
diff --git a/ace/OS.cpp b/ace/OS.cpp
index a6155fc9feb..f4d6d258c3a 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -269,8 +269,14 @@ ACE_OS::uname (struct utsname *name)
                      vinfo.dwBuildNumber,
                      vinfo.szCSDVersion);
 
-    TCHAR processor[10] = __TEXT ("Unknown");
-    TCHAR subtype[10] = __TEXT ("Unknown");
+    // We have to make sure that the size of (processor + subtype) is
+    // not greater than the size of name->machine.  So we give half
+    // the space to the processor and half the space to subtype.  The
+    // -1 is necessary for because of the space between processor and
+    // subtype in the machine name.
+    const int bufsize = ((sizeof (name->machine) / sizeof (TCHAR)) / 2) - 1;
+    TCHAR processor[bufsize] = __TEXT ("Unknown");
+    TCHAR subtype[bufsize] = __TEXT ("Unknown");
 
 #if defined (__BORLANDC__)
     // Some changes should be made in winbase.h...
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index d71ec81d6d5..e03f14b83e7 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -1735,7 +1735,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
                 this->wakeup_one_thread_.signal ();
 
               // Break the loop as we have reached max_notify_iterations_
-              break;
+              return 0;
             }
 	}
     }