ChangeLogTag:Sat Jul 08 14:50:34 2000 David L. Levine <levine@cs.wustl.edu>

7 files changed, 93 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c866aa5446..89802b455bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@ Sat Jul 08 14:50:34 2000  David L. Levine  <levine@cs.wustl.edu>
 
         * all Makefiles: updated dependencies.
 
+Fri Jul  7 20:24:30 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* examples/Reactor/Multicast/server.cpp:  The last character 0x0D in the
+	  message was messing up the display.  Thanks to Zoran Ivanovic
+ 	  <Zoran_Ivanovic@i2.com> for this fix.
+
 Fri Jul 07 17:17:21 2000  George Reid <greid@entrenet.com>
 
         * ace/config-mvs.h: long long support was introduced in os/390
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 6c866aa5446..89802b455bb 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -2,6 +2,12 @@ Sat Jul 08 14:50:34 2000  David L. Levine  <levine@cs.wustl.edu>
 
         * all Makefiles: updated dependencies.
 
+Fri Jul  7 20:24:30 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* examples/Reactor/Multicast/server.cpp:  The last character 0x0D in the
+	  message was messing up the display.  Thanks to Zoran Ivanovic
+ 	  <Zoran_Ivanovic@i2.com> for this fix.
+
 Fri Jul 07 17:17:21 2000  George Reid <greid@entrenet.com>
 
         * ace/config-mvs.h: long long support was introduced in os/390
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 6c866aa5446..89802b455bb 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -2,6 +2,12 @@ Sat Jul 08 14:50:34 2000  David L. Levine  <levine@cs.wustl.edu>
 
         * all Makefiles: updated dependencies.
 
+Fri Jul  7 20:24:30 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* examples/Reactor/Multicast/server.cpp:  The last character 0x0D in the
+	  message was messing up the display.  Thanks to Zoran Ivanovic
+ 	  <Zoran_Ivanovic@i2.com> for this fix.
+
 Fri Jul 07 17:17:21 2000  George Reid <greid@entrenet.com>
 
         * ace/config-mvs.h: long long support was introduced in os/390
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 358f4200fd9..5b11f83fa2b 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Sat Jul  8 17:26:49 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* tao/Acceptor_Registry.cpp (open_i): Changed astr from
+	  char * to const char * to prevent a warning.  Thanks to
+	  Marina for reporting this.
+
 Sat Jul 08 18:08:24 2000  Angelo Corsaro  <corsaro@cs.wustl.edu>
 
 	* test/Exposed_Policies/server.cpp:
@@ -13,25 +19,25 @@ Sat Jul 08 18:08:24 2000  Angelo Corsaro  <corsaro@cs.wustl.edu>
 
 Sat Jul  8 17:45:00 2000  Bruce Trask  <brucetrask@aol.com>
 
-      * tao/DomainS.cpp:
-        Changed all _dispatch functions in skeletons to call
-        synchronous_upcall_dispatch function. 
- 
-      * tao/ImplRepoS.cpp:
-        Changed all _dispatch functions in skeletons to call
-        synchronous_upcall_dispatch function. 
-
-      * tao/MessagingS.cpp:
-        Changed all _dispatch functions in skeletons to call
-        synchronous_upcall_dispatch function. 
+        * tao/DomainS.cpp:
+          Changed all _dispatch functions in skeletons to call
+          synchronous_upcall_dispatch function. 
+   
+        * tao/ImplRepoS.cpp:
+          Changed all _dispatch functions in skeletons to call
+          synchronous_upcall_dispatch function. 
 
-      * tao/POAS.cpp:
-        Changed all _dispatch functions in skeletons to call
-        synchronous_upcall_dispatch function. 
+        * tao/MessagingS.cpp:
+          Changed all _dispatch functions in skeletons to call
+          synchronous_upcall_dispatch function. 
+  
+        * tao/POAS.cpp:
+          Changed all _dispatch functions in skeletons to call
+          synchronous_upcall_dispatch function. 
  
-      * tao/PolicyS.cpp:
-        Changed all _dispatch functions in skeletons to call
-        synchronous_upcall_dispatch function.      
+        * tao/PolicyS.cpp:
+          Changed all _dispatch functions in skeletons to call
+          synchronous_upcall_dispatch function.      
 
 Sat Jul  8 16:10:27 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 5c592a0ce40..08ec327b1f1 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -424,16 +424,16 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
   char *last_addr = 0;
   ACE_Auto_Basic_Array_Ptr <char> addr_str (addrs.rep ());
 
-  char *astr = ACE_OS::strtok_r (addr_str.get (),
-                                 ",",
-                                 &last_addr);
+  const char *astr = ACE_OS::strtok_r (addr_str.get (),
+                                       ",",
+                                       &last_addr);
   if (astr == 0)
     astr = "";
 
   // Iterate over the addrs specified in the endpoint.
    
   for ( ;
-       astr != 0 ;
+       astr != 0;
        astr = ACE_OS::strtok_r (0,
                                 ",",
                                 &last_addr))
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 934277a95af..54a2373d3ea 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1736,17 +1736,17 @@ CORBA_ORB::ior_string_to_object (const char *str,
 }
 
 CORBA::Object_ptr
-CORBA_ORB::file_string_to_object (const char* filename,
+CORBA_ORB::file_string_to_object (const char *filename,
                                   CORBA::Environment& ACE_TRY_ENV)
 {
-  FILE* file = ACE_OS::fopen (filename, "r");
+  FILE *file = ACE_OS::fopen (filename, "r");
 
   if (file == 0)
     return CORBA::Object::_nil ();
 
   ACE_Read_Buffer reader (file, 1);
 
-  char* string = reader.read ();
+  char *string = reader.read ();
 
   if (string == 0)
     return CORBA::Object::_nil ();
diff --git a/examples/Reactor/Multicast/server.cpp b/examples/Reactor/Multicast/server.cpp
index 20b577a5088..57091019794 100644
--- a/examples/Reactor/Multicast/server.cpp
+++ b/examples/Reactor/Multicast/server.cpp
@@ -81,12 +81,16 @@ Server_Events::Server_Events (u_short port,
 {
   // Use ACE_SOCK_Dgram_Mcast factory to subscribe to multicast group.
 
-  if (ACE_OS::hostname (this->hostname_, MAXHOSTNAMELEN) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "hostname"));
+  if (ACE_OS::hostname (this->hostname_,
+                        MAXHOSTNAMELEN) == -1)
+    ACE_ERROR ((LM_ERROR,
+                "%p\n",
+                "hostname"));
 
   else if (this->mcast_dgram_.subscribe (this->mcast_addr_) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "subscribe"));
-
+    ACE_ERROR ((LM_ERROR,
+                "%p\n",
+                "subscribe"));
   else
     {
       // Point to NULL so that we block in the beginning.
@@ -103,10 +107,13 @@ Server_Events::~Server_Events (void)
 {
   this->mcast_dgram_.unsubscribe ();
 
-  ACE_DEBUG ((LM_DEBUG, "total bytes received = %d after %d second\n",
-              this->total_bytes_received_, this->interval_));
+  ACE_DEBUG ((LM_DEBUG,
+              "total bytes received = %d after %d second\n",
+              this->total_bytes_received_,
+              this->interval_));
 
-  ACE_DEBUG ((LM_DEBUG, "Mbits/sec = %.2f\n",
+  ACE_DEBUG ((LM_DEBUG,
+              "Mbits/sec = %.2f\n",
               (float) (total_bytes_received_ * 8 / (float) (1024*1024*interval_))));
 
   ACE_DEBUG ((LM_DEBUG,
@@ -152,17 +159,30 @@ Server_Events::handle_input (ACE_HANDLE)
   iovp[1].iov_len  = 4 * BUFSIZ - sizeof (log_record_);
 
   ssize_t retcode =
-    this->mcast_dgram_.recv (iovp, 2, this->remote_addr_);
-
+    this->mcast_dgram_.recv (iovp,
+                             2,
+                             this->remote_addr_);
   if (retcode != -1)
     {
       total_messages_received_++;
       total_bytes_received_ += retcode;
-      last_sequence_number_ = ntohl (log_record_->sequence_number);
+      last_sequence_number_ =
+        ntohl (log_record_->sequence_number);
+      
+      for (char *message_end = this->message_ + ACE_OS::strlen (this->message_) - 1;
+           ACE_OS::strchr ("\r\n \t", *message_end) != 0;
+           )
+        {
+          *message_end-- = '\0';
+          if (message_end == this->message_) 
+            break;
+        }
 
-      ACE_DEBUG ((LM_DEBUG, "sequence number = %d\n",
+      ACE_DEBUG ((LM_DEBUG,
+                  "sequence number = %d\n",
                   last_sequence_number_));
-      ACE_DEBUG ((LM_DEBUG, "message = '%s'\n",
+      ACE_DEBUG ((LM_DEBUG,
+                  "message = '%s'\n",
                   this->message_));
 
       if (this->initialized_ == 0)
@@ -172,7 +192,10 @@ Server_Events::handle_input (ACE_HANDLE)
                                          (void *) this->hostname_,
                                          ACE_Time_Value::zero,
                                          ACE_Time_Value (DURATION)) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1);
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "%p\n",
+                               "schedule_timer"),
+                              -1);
           this->initialized_ = 1;
         }
 
@@ -188,16 +211,21 @@ main (int, char *[])
 {
   // Instantiate a server which will receive messages for DURATION
   // seconds.
-  Server_Events server_events (UDP_PORT, MCAST_ADDR, DURATION);
-
+  Server_Events server_events (UDP_PORT,
+                               MCAST_ADDR,
+                               DURATION);
   // Instance of the ACE_Reactor.
   ACE_Reactor reactor;
 
   if (reactor.register_handler (&server_events,
                                 ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
+    ACE_ERROR ((LM_ERROR,
+                "%p\n%a",
+                "register_handler",
+                1));
 
-  ACE_DEBUG ((LM_DEBUG, "starting up server\n"));
+  ACE_DEBUG ((LM_DEBUG,
+              "starting up server\n"));
 
   for (;;)
     reactor.handle_events (server_events.wait_time ());