ywhoopie!!

whoopie, more new stuff, more things will break!!
I have no idea about this file. Heck, I am not even Doug!

6 files changed, 10 insertions, 8 deletions

diff --git a/examples/ASX/UPIPE_Event_Server/event_server.cpp b/examples/ASX/UPIPE_Event_Server/event_server.cpp
index 4f1add6403f..58ebe4b5b32 100644
--- a/examples/ASX/UPIPE_Event_Server/event_server.cpp
+++ b/examples/ASX/UPIPE_Event_Server/event_server.cpp
@@ -59,7 +59,7 @@ consumer (void *)
   int iter = options.iterations ();
   int verb = options.verbose ();
   int msiz = options.message_size ();
-  int secs, par1, par2, i;
+  int secs, par1, par2;
   time_t currsec;
 
   if (verb)
@@ -72,7 +72,6 @@ consumer (void *)
   else
     cout << "consumer :we're connected" << endl;
 
-  char buf[BUFSIZ];
   int n;
   ACE_Message_Block *mb_p;
 
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index 2ae054cb445..8300e11a965 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -160,7 +160,9 @@ Logging_Handler::handle_input (ACE_HANDLE)
 	ACE_Log_Record lp;
 
         len = ntohl (len);
-	if ((n = this->peer ().recv_n ((void *) &lp, len)) != len)
+	n = this->peer ().recv_n ((void *) &lp, len);
+
+	if (n != len)
 	  ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p at host %s\n",
 			    "client logger", this->peer_name_), -1);
 	/* NOTREACHED */
diff --git a/examples/Logger/simple-server/Logging_Handler.cpp b/examples/Logger/simple-server/Logging_Handler.cpp
index 596f7974885..005e4cf2fc3 100644
--- a/examples/Logger/simple-server/Logging_Handler.cpp
+++ b/examples/Logger/simple-server/Logging_Handler.cpp
@@ -62,7 +62,8 @@ Logging_Handler::handle_input (ACE_HANDLE)
 	ACE_Log_Record lp;
 
         len = ntohl (len);
-	if ((n = this->cli_stream_.recv_n ((void *) &lp, len)) != len)
+	n = this->cli_stream_.recv_n ((void *) &lp, len);
+	if (n != len)
 	  ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p at host %s\n",
 			    "client logger", this->host_name_), -1);
 	/* NOTREACHED */
diff --git a/examples/Misc/test_read_buffer.cpp b/examples/Misc/test_read_buffer.cpp
index caf7330f200..c661e4f1159 100644
--- a/examples/Misc/test_read_buffer.cpp
+++ b/examples/Misc/test_read_buffer.cpp
@@ -18,7 +18,7 @@ main (int argc, char *argv[])
   while ((buf = rb.read (term, search, replace)) != 0)
     {
       ::write (1, buf, rb.size ());
-      ACE_Service_Config::allocator ()->free (buf);
+      ACE_Service_Config::alloc ()->free (buf);
     }
   return 0;
 }
diff --git a/examples/Misc/test_sstring.cpp b/examples/Misc/test_sstring.cpp
index 1af58b9f627..55e797c3851 100644
--- a/examples/Misc/test_sstring.cpp
+++ b/examples/Misc/test_sstring.cpp
@@ -1,9 +1,9 @@
-#include "ace/SString.h"
 // $Id$
 
+#include "ace/SString.h"
 
 int 
-main (int argc, char *argv[])
+main (int, char *[])
 {
   ACE_CString s1 ("hello");
   ACE_CString s2 ("world");
diff --git a/examples/Reactor/Multicast/server.cpp b/examples/Reactor/Multicast/server.cpp
index c3f481eaadf..2f1e29b287f 100644
--- a/examples/Reactor/Multicast/server.cpp
+++ b/examples/Reactor/Multicast/server.cpp
@@ -74,7 +74,7 @@ Server_Events::Server_Events (u_short port,
   this->how_long_ = 0;
 
   this->log_record_ = (Log_Wrapper::ACE_Log_Record *) &buf_;
-  this->message_    = &buf_[sizeof (Log_Wrapper::ACE_Log_Record)];
+  this->message_ = &buf_[sizeof (Log_Wrapper::ACE_Log_Record)];
 }
 
 // A destructor that emacs refuses to color blue ;-)