ChangeLogTag:Wed Apr 27 23:36:45 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

5 files changed, 104 insertions, 104 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index f6b184d02f6..3d5b4920e50 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -233,7 +233,7 @@ Sender::init (int argc,
   ACE_Reactor *reactor =
     TAO_AV_CORE::instance ()->reactor ();
 
-  
+
   if (reactor->register_handler (SIGINT,
                                  &this->signal_handler_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 16e94ae9295..f694ebb2ec8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -52,7 +52,7 @@ int
 FTP_Server_Callback::handle_end_stream (void)
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::end_stream\n"));
-  done = 1; 
+  done = 1;
   return 0;
 }
 
@@ -138,10 +138,10 @@ Server::run (void)
       while( !done )
       {
          if ( orb->work_pending( ACE_ENV_SINGLE_ARG_PARAMETER ) )
-	 {
+         {
               orb->perform_work( ACE_ENV_SINGLE_ARG_PARAMETER );
-	      ACE_TRY_CHECK;
-	 }
+              ACE_TRY_CHECK;
+         }
       }
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 93c65d38ed2..7cd5ef06af6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -216,19 +216,19 @@ Client::init (int argc,
   ACE_INET_Addr* addr;
   if (this->address_ != 0)
     ACE_NEW_RETURN (addr,
-		    ACE_INET_Addr (this->address_),
-		    -1);
+                    ACE_INET_Addr (this->address_),
+                    -1);
   else
     {
       char buf [BUFSIZ];
       ACE_OS::hostname (buf,
-			BUFSIZ);
+                        BUFSIZ);
       ACE_NEW_RETURN (addr,
-		      ACE_INET_Addr ("5000",
-				     buf),
-		      -1);
+                      ACE_INET_Addr ("5000",
+                                     buf),
+                      -1);
     }
-		    
+
   // Initialize the flowname
   ACE_NEW_RETURN (this->flowname_,
                   char [BUFSIZ],
@@ -249,17 +249,17 @@ Client::init (int argc,
   ACE_INET_Addr* peer_addr;
   if (this->peer_addr_str_ != 0)
     ACE_NEW_RETURN (peer_addr,
-		    ACE_INET_Addr (this->peer_addr_str_),
-		    -1);
+                    ACE_INET_Addr (this->peer_addr_str_),
+                    -1);
   else
     {
       char buf [BUFSIZ];
       ACE_OS::hostname (buf,
-			BUFSIZ);
+                        BUFSIZ);
       ACE_NEW_RETURN (peer_addr,
-		      ACE_INET_Addr ("5050",
-				     buf),
-		      -1);
+                      ACE_INET_Addr ("5050",
+                                     buf),
+                      -1);
     }
 
   entry.set_peer_addr (peer_addr);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index da831b31ff3..194ad062352 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -46,7 +46,7 @@ Sender::Sender (void)
     address_ (0),
     peer_address_ (0),
     local_sec_addrs_ (0),
-    peer_sec_addrs_ (0),    
+    peer_sec_addrs_ (0),
     num_local_sec_addrs_ (0),
     num_peer_sec_addrs_ (0),
     max_frame_count_ (20)
@@ -85,53 +85,53 @@ Sender::parse_args (int argc,
         case 'd':
           TAO_debug_level++;
           break;
-	case 'b':
-	  mb_.size (ACE_OS::atoi (opts.opt_arg ()));
-	  break;
-	case 's':
-	  {
-	    max_frame_count_ = (long) ACE_OS::atoi (opts.opt_arg ());
-	    if (max_frame_count_ > 1000000)
-	      ACE_ERROR_RETURN ((LM_ERROR,
-				 "Max Frame Count should be < 10^6 \n"),
-				-1);
-	    break;
-	  }
+        case 'b':
+          mb_.size (ACE_OS::atoi (opts.opt_arg ()));
+          break;
+        case 's':
+          {
+            max_frame_count_ = (long) ACE_OS::atoi (opts.opt_arg ());
+            if (max_frame_count_ > 1000000)
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "Max Frame Count should be < 10^6 \n"),
+                                -1);
+            break;
+          }
         case 'l':
-	  {
-	    TAO_Tokenizer addr_token (opts.opt_arg (), ',');
-	    this->address_ = CORBA::string_dup (addr_token [0]);
-	    num_local_sec_addrs_ = addr_token.num_tokens () - 1;
-	    if (num_local_sec_addrs_ != 0)
-	      ACE_NEW_RETURN (local_sec_addrs_, char* [num_local_sec_addrs_], -1);
-	    for (int j = 1; j <= num_local_sec_addrs_; j++)
-	      {
-		ACE_DEBUG ((LM_DEBUG,
-			    "adding addresses to sequence %s\n",
-			    addr_token [j]));
-		
-		local_sec_addrs_ [j-1] =  CORBA::string_dup (addr_token [j]);
-	      }
-	  }
-	  break;
+          {
+            TAO_Tokenizer addr_token (opts.opt_arg (), ',');
+            this->address_ = CORBA::string_dup (addr_token [0]);
+            num_local_sec_addrs_ = addr_token.num_tokens () - 1;
+            if (num_local_sec_addrs_ != 0)
+              ACE_NEW_RETURN (local_sec_addrs_, char* [num_local_sec_addrs_], -1);
+            for (int j = 1; j <= num_local_sec_addrs_; j++)
+              {
+                ACE_DEBUG ((LM_DEBUG,
+                            "adding addresses to sequence %s\n",
+                            addr_token [j]));
+
+                local_sec_addrs_ [j-1] =  CORBA::string_dup (addr_token [j]);
+              }
+          }
+          break;
         case 'a':
-	  {
-	    TAO_Tokenizer addr_token (opts.opt_arg (), ',');
-	    this->peer_address_ = CORBA::string_dup (addr_token [0]);
-	    num_peer_sec_addrs_ = addr_token.num_tokens () - 1;
-	    if (num_peer_sec_addrs_ != 0)
-	      ACE_NEW_RETURN (peer_sec_addrs_, char* [num_peer_sec_addrs_], -1);
-	    for (int j = 1; j <= num_peer_sec_addrs_; j++)
-	      {
-		ACE_DEBUG ((LM_DEBUG,
-			    "adding addresses to sequence %s\n",
-			    addr_token [j]));
-		
-		peer_sec_addrs_ [j-1] =  CORBA::string_dup (addr_token [j]);
-	      }
-	  }
-	  break;
-	default:
+          {
+            TAO_Tokenizer addr_token (opts.opt_arg (), ',');
+            this->peer_address_ = CORBA::string_dup (addr_token [0]);
+            num_peer_sec_addrs_ = addr_token.num_tokens () - 1;
+            if (num_peer_sec_addrs_ != 0)
+              ACE_NEW_RETURN (peer_sec_addrs_, char* [num_peer_sec_addrs_], -1);
+            for (int j = 1; j <= num_peer_sec_addrs_; j++)
+              {
+                ACE_DEBUG ((LM_DEBUG,
+                            "adding addresses to sequence %s\n",
+                            addr_token [j]));
+
+                peer_sec_addrs_ [j-1] =  CORBA::string_dup (addr_token [j]);
+              }
+          }
+          break;
+        default:
           ACE_DEBUG ((LM_DEBUG, "Unknown Option\n"));
           return -1;
         }
@@ -222,17 +222,17 @@ Sender::init (int argc,
   // Set the address of the ftp client.
   ACE_INET_Addr addr;
   char buf [BUFSIZ];
-      
+
   if (address_ != 0)
     addr.set (address_);
   else
     {
       ACE_OS::hostname (buf,
-			BUFSIZ);
+                        BUFSIZ);
       addr.set (8000,
-		buf);
+                buf);
     }
-  
+
   // Create the forward flow specification to describe the flow.
   TAO_Forward_FlowSpec_Entry entry ("Data_Receiver",
                                     "IN",
@@ -247,15 +247,15 @@ Sender::init (int argc,
   else
     {
       ACE_OS::hostname (buf,
-			BUFSIZ);
+                        BUFSIZ);
       peer_addr.set (8050,
-		     buf);
+                     buf);
     }
 
   entry.set_peer_addr (&peer_addr);
 
   entry.set_local_sec_addr (local_sec_addrs_, num_local_sec_addrs_);
-  
+
   entry.set_peer_sec_addr (peer_sec_addrs_, num_peer_sec_addrs_);
 
   AVStreams::flowSpec flow_spec (1);
@@ -342,9 +342,9 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
               // At end of file break the loop and end the sender.
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,"End of file - Rewinding\n"));
-	      
-	      ACE_OS::rewind (this->input_file_);
-	    }
+
+              ACE_OS::rewind (this->input_file_);
+            }
 
           this->mb_.wr_ptr (n);
 
@@ -392,7 +392,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
           // Send frame.
           int result =
-	    this->protocol_object_->send_frame (&this->mb_);
+            this->protocol_object_->send_frame (&this->mb_);
 
           if (result < 0)
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -400,12 +400,12 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                                "Sender::pace_data send\n"),
                               -1);
 
-	    ACE_DEBUG ((LM_DEBUG,
-			"Sender::pace_data frame %d was sent succesfully %d\n",
-			++this->frame_count_,
-			buffer_size));
+            ACE_DEBUG ((LM_DEBUG,
+                        "Sender::pace_data frame %d was sent succesfully %d\n",
+                        ++this->frame_count_,
+                        buffer_size));
 
-	  ++this->frame_count_;
+          ++this->frame_count_;
 
           // Reset the message block.
           this->mb_.reset ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index c683791eeb8..34104524d65 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -103,19 +103,19 @@ Sender::parse_args (int argc,
           this->filename_ = opts.opt_arg ();
           break;
         case 'p':
-	    this->protocol_ = opts.opt_arg ();
+            this->protocol_ = opts.opt_arg ();
 #ifdef ACE_HAS_RAPI
-	    if (this->protocol_ != ACE_CString ("QoS_UDP"))
-	      ACE_ERROR_RETURN ((LM_ERROR,
-				 "When rapi=1 protocol must be QoS_UDP\n"),
-				-1);
-#else 
-  	    if (this->protocol_ == ACE_CString ("QoS_UDP"))
-	      ACE_ERROR_RETURN ((LM_ERROR,
-		  	         "When rapi=0 protocol must not be QoS_UDP\n"),
-				-1);
+            if (this->protocol_ != ACE_CString ("QoS_UDP"))
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "When rapi=1 protocol must be QoS_UDP\n"),
+                                -1);
+#else
+            if (this->protocol_ == ACE_CString ("QoS_UDP"))
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "When rapi=0 protocol must not be QoS_UDP\n"),
+                                -1);
 #endif //ACE_HAS_RAPI
-	    break;
+            break;
         case 'r':
           this->frame_rate_ = (double)ACE_OS::atoi (opts.opt_arg ());
           break;
@@ -272,17 +272,17 @@ Sender::init (int argc,
   ACE_INET_Addr* addr;
   if (this->address_ != 0)
     ACE_NEW_RETURN (addr,
-		    ACE_INET_Addr (this->address_),
-		    -1);
+                    ACE_INET_Addr (this->address_),
+                    -1);
   else
     {
       char buf [BUFSIZ];
       ACE_OS::hostname (buf,
-			BUFSIZ);
+                        BUFSIZ);
       ACE_NEW_RETURN (addr,
-		      ACE_INET_Addr ("5000",
-				     buf),
-		      -1);
+                      ACE_INET_Addr ("5000",
+                                     buf),
+                      -1);
     }
 
   // Create the forward flow specification to describe the flow.
@@ -296,17 +296,17 @@ Sender::init (int argc,
   ACE_INET_Addr* peer_addr;
   if (this->peer_addr_ != 0)
     ACE_NEW_RETURN (peer_addr,
-		    ACE_INET_Addr (this->peer_addr_),
-		    -1);
+                    ACE_INET_Addr (this->peer_addr_),
+                    -1);
   else
     {
       char buf [BUFSIZ];
       ACE_OS::hostname (buf,
-			BUFSIZ);
+                        BUFSIZ);
       ACE_NEW_RETURN (peer_addr,
-		      ACE_INET_Addr ("5050",
-				     buf),
-		      -1);
+                      ACE_INET_Addr ("5050",
+                                     buf),
+                      -1);
     }
 
   entry.set_peer_addr (peer_addr);
@@ -487,7 +487,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
       this->streamctrl_->destroy (stop_spec
                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       // Shut the orb down.
       TAO_AV_CORE::instance ()->orb ()->shutdown (0
                                                   ACE_ENV_ARG_PARAMETER);