Mon Aug 13 20:27:43 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

23 files changed, 299 insertions, 279 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 08eeb632706..8ef35d4443a 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,30 @@
+Mon Aug 13 20:27:43 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * ace/Assert.cpp:
+        * ace/Connector.cpp:
+        * ace/Dev_Poll_Reactor.cpp:
+        * ace/INET_Addr.cpp:
+        * ace/Notification_Queue.h:
+        * ace/Notification_Queue.cpp:
+        * ace/OS_NS_Thread.cpp:
+        * ace/OS_NS_dirent.inl:
+        * ace/POSIX_Proactor.cpp:
+        * ace/Process_Manager.h:
+        * ace/Process_Manager.cpp:
+        * ace/QoS/QoS_Session_Impl.cpp:
+        * ace/Rtems_init.c:
+        * ace/SOCK_Dgram.cpp:
+        * ace/SOCK_IO.cpp:
+        * ace/SPIPE_Acceptor.cpp:
+        * ace/Select_Reactor_Base.cpp:
+        * ace/Service_Config.h:
+        * ace/config-vxworks5.x.h:
+        * ace/config-vxworks6.2.h:
+        * ace/config-vxworks6.3.h:
+        * ace/os_include/sys/os_socket.h:
+
+          Untabify.
+
 Mon Aug 13 14:52:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Truncate.h:
diff --git a/ACE/ace/Assert.cpp b/ACE/ace/Assert.cpp
index 20ef735ba40..06e4f34d2ea 100644
--- a/ACE/ace/Assert.cpp
+++ b/ACE/ace/Assert.cpp
@@ -16,7 +16,7 @@ __ace_assert(const char *file, int line, const ACE_TCHAR *expression)
   ACE_Log_Msg *log = ACE_Log_Msg::instance ();
 
   log->set (file, line, -1, error, log->restart (),
-	    log->msg_ostream (), log->msg_callback ());
+            log->msg_ostream (), log->msg_callback ());
 
   log->log (LM_ERROR, ACE_TEXT ("ACE_ASSERT: file %N, line %l assertion failed for '%s'.%a\n"), expression, -1);
 }
diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp
index 628b530801d..c971329c0cd 100644
--- a/ACE/ace/Connector.cpp
+++ b/ACE/ace/Connector.cpp
@@ -655,8 +655,8 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
   ACE_HANDLE *handle = 0;
   while (1)
     {
-      ACE_Unbounded_Set_Iterator<ACE_HANDLE>
-	iterator (this->non_blocking_handles ());
+      ACE_Unbounded_Set_Iterator<ACE_HANDLE> 
+        iterator (this->non_blocking_handles ());
       if (!iterator.next (handle))
         break;
 
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index 51f5654326b..f9a83b635b6 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -83,9 +83,9 @@ ACE_Dev_Poll_Reactor_Notify::open (ACE_Reactor_Impl *r,
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
       if (notification_queue_.open () == -1)
-	{
-	  return -1;
-	}
+        {
+          return -1;
+        }
 
       if (ACE::set_flags (this->notification_pipe_.write_handle (),
                           ACE_NONBLOCK) == -1)
@@ -572,7 +572,7 @@ ACE_Dev_Poll_Reactor_Handler_Repository::bind (
 
 int
 ACE_Dev_Poll_Reactor_Handler_Repository::unbind (ACE_HANDLE handle,
-						 bool decr_refcnt)
+                                                 bool decr_refcnt)
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::unbind");
 
@@ -1050,7 +1050,7 @@ ACE_Dev_Poll_Reactor::handle_events_i (ACE_Time_Value *max_wait_time,
     {
       result = this->work_pending_i (max_wait_time);
       if (result == -1)
-	ACE_ERROR ((LM_ERROR, "%t: %p\n", "work_pending_i"));
+        ACE_ERROR ((LM_ERROR, "%t: %p\n", "work_pending_i"));
     }
   while (result == -1 && this->restart_ != 0 && errno == EINTR);
 
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index 15562da42f1..c9a562661cc 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -914,7 +914,7 @@ int ACE_INET_Addr::set_address (const char *ip_addr,
       if (this->get_type () == AF_INET && map == 0) {
         this->base_set (AF_INET, sizeof (this->inet_addr_.in4_));
 #ifdef ACE_HAS_SOCKADDR_IN_SIN_LEN
-	this->inet_addr_.in4_.sin_len = sizeof (this->inet_addr_.in4_);
+        this->inet_addr_.in4_.sin_len = sizeof (this->inet_addr_.in4_);
 #endif
         this->inet_addr_.in4_.sin_family = AF_INET;
         this->set_size (sizeof (this->inet_addr_.in4_));
@@ -928,7 +928,7 @@ int ACE_INET_Addr::set_address (const char *ip_addr,
           // this->set_type (AF_INET);
           this->base_set (AF_INET, sizeof (this->inet_addr_.in4_));
 #ifdef ACE_HAS_SOCKADDR_IN_SIN_LEN
-	  this->inet_addr_.in4_.sin_len = sizeof (this->inet_addr_.in4_);
+          this->inet_addr_.in4_.sin_len = sizeof (this->inet_addr_.in4_);
 #endif
           this->inet_addr_.in4_.sin_family = AF_INET;
           this->set_size (sizeof (this->inet_addr_.in4_));
@@ -941,7 +941,7 @@ int ACE_INET_Addr::set_address (const char *ip_addr,
         {
           this->base_set (AF_INET6, sizeof (this->inet_addr_.in6_));
 #ifdef ACE_HAS_SOCKADDR_IN6_SIN6_LEN
-	  this->inet_addr_.in6_.sin6_len = sizeof (this->inet_addr_.in6_);
+          this->inet_addr_.in6_.sin6_len = sizeof (this->inet_addr_.in6_);
 #endif
           this->inet_addr_.in6_.sin6_family = AF_INET6;
           this->set_size (sizeof (this->inet_addr_.in6_));
diff --git a/ACE/ace/Notification_Queue.cpp b/ACE/ace/Notification_Queue.cpp
index d1a15dc220b..ee0b6a31100 100644
--- a/ACE/ace/Notification_Queue.cpp
+++ b/ACE/ace/Notification_Queue.cpp
@@ -79,8 +79,8 @@ allocate_more_buffers()
   ACE_Notification_Queue_Node *temp = 0;
 
   ACE_NEW_RETURN (temp,
-		  ACE_Notification_Queue_Node[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE],
-		  -1);
+                  ACE_Notification_Queue_Node[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE],
+                  -1);
 
   if (this->alloc_queue_.enqueue_head (temp) == -1)
     {
@@ -99,7 +99,7 @@ allocate_more_buffers()
 int
 ACE_Notification_Queue::
 purge_pending_notifications(ACE_Event_Handler * eh,
-			    ACE_Reactor_Mask mask)
+                            ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_Notification_Queue::purge_pending_notifications");
 
@@ -113,20 +113,20 @@ purge_pending_notifications(ACE_Event_Handler * eh,
   while(node != 0)
     {
       if (!node->matches_for_purging(eh))
-	{
-	  // Easy case, skip to the next node
+        {
+          // Easy case, skip to the next node
           node = node->next();
-	  continue;
-	}
+          continue;
+        }
 
       if (!node->mask_disables_all_notifications(mask))
-	{
+        {
           // ... another easy case, skip this node too, but clear the
           // mask first ...
-	  node->clear_mask(mask);
+          node->clear_mask(mask);
           node = node->next();
-	  continue;
-	}
+          continue;
+        }
 
       // ... this is the more complicated case, we want to remove the
       // node from the notify_queue_ list.  First save the next node
@@ -140,7 +140,7 @@ purge_pending_notifications(ACE_Event_Handler * eh,
       // ... release resources ...
       ACE_Event_Handler *event_handler = node->get().eh_;
       event_handler->remove_reference ();
-      
+
       // ... now this is a free node ...
       free_queue_.push_front(node);
 
@@ -168,9 +168,9 @@ push_new_notification(
   if (free_queue_.is_empty())
     {
       if (allocate_more_buffers() == -1)
-	{
-	  return -1;
-	}
+        {
+          return -1;
+        }
     }
 
   ACE_Notification_Queue_Node * node =
diff --git a/ACE/ace/Notification_Queue.h b/ACE/ace/Notification_Queue.h
index a0348822060..d4cf815aada 100644
--- a/ACE/ace/Notification_Queue.h
+++ b/ACE/ace/Notification_Queue.h
@@ -100,7 +100,7 @@ public:
    * detailed description.  This is just a helper function.
    */
   int purge_pending_notifications(ACE_Event_Handler * eh,
-				  ACE_Reactor_Mask mask);
+                                  ACE_Reactor_Mask mask);
 
   /**
    * @brief Add a new notification to the queue
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index cf883ac03d6..f3328c6f896 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -4202,15 +4202,15 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
       if (ACE_BIT_ENABLED (flags, THR_SUSPENDED))
         {
            if (ACE_ADAPT_RETVAL(::pthread_attr_setcreatesuspend_np(&attr), result) != 0)
-	     {
+            {
 
 #     if defined (ACE_HAS_PTHREADS_DRAFT4)
               ::pthread_attr_delete (&attr);
 #     else /* ACE_HAS_PTHREADS_DRAFT4 */
               ::pthread_attr_destroy (&attr);
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 */
-	      return -1;
-	    }
+              return -1;
+            }
         }
 #   endif /* !ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP */
 
diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl
index 4de83b6d946..b32b98ac87a 100644
--- a/ACE/ace/OS_NS_dirent.inl
+++ b/ACE/ace/OS_NS_dirent.inl
@@ -143,16 +143,16 @@ alphasort (const void *a, const void *b)
 {
 #if defined (ACE_LACKS_ALPHASORT)
   return ACE_OS::strcmp ((*static_cast<const struct ACE_DIRENT * const *>(a))->d_name,
-			 (*static_cast<const struct ACE_DIRENT * const *>(b))->d_name);
+                          (*static_cast<const struct ACE_DIRENT * const *>(b))->d_name);
 #else
 #  if defined (ACE_SCANDIR_CMP_USES_VOIDPTR)
   return ::alphasort (const_cast<void *>(a),
-		      const_cast<void *>(b));
+                      const_cast<void *>(b));
 #  elif defined (ACE_SCANDIR_CMP_USES_CONST_VOIDPTR)
   return ::alphasort (a, b);
 #  else
   return ::alphasort ((const struct ACE_DIRENT **)a,
-		      (const struct ACE_DIRENT **)b);
+                      (const struct ACE_DIRENT **)b);
 #  endif
 #endif
 }
diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp
index 5972cb840d2..22ccf3aed15 100644
--- a/ACE/ace/POSIX_Proactor.cpp
+++ b/ACE/ace/POSIX_Proactor.cpp
@@ -1329,7 +1329,7 @@ ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result,
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%N:%l:(%P|%t)::")
                          ACE_TEXT ("start_aio: Invalid op code %d\n"),
-			 op),
+                         op),
                         -1);
     }
 
diff --git a/ACE/ace/Process_Manager.cpp b/ACE/ace/Process_Manager.cpp
index 5bff4198d4a..8f120b1135f 100644
--- a/ACE/ace/Process_Manager.cpp
+++ b/ACE/ace/Process_Manager.cpp
@@ -495,7 +495,7 @@ ACE_Process_Manager::spawn_n (size_t n,
 
 int
 ACE_Process_Manager::append_proc (ACE_Process *proc,
-				  ACE_Event_Handler *event_handler)
+                                  ACE_Event_Handler *event_handler)
 {
   ACE_TRACE ("ACE_Process_Manager::append_proc");
 
@@ -535,7 +535,7 @@ ACE_Process_Manager::append_proc (ACE_Process *proc,
 
 int
 ACE_Process_Manager::insert_proc (ACE_Process *proc,
-				  ACE_Event_Handler *event_handler)
+                                  ACE_Event_Handler *event_handler)
 {
   ACE_TRACE ("ACE_Process_Manager::insert_proc");
 
diff --git a/ACE/ace/Process_Manager.h b/ACE/ace/Process_Manager.h
index 6c1efa17051..163c440bf46 100644
--- a/ACE/ace/Process_Manager.h
+++ b/ACE/ace/Process_Manager.h
@@ -183,7 +183,7 @@ public:
    * On failure, returns ACE_INVALID_PID.
    */
   pid_t spawn (ACE_Process_Options &options,
-	       ACE_Event_Handler *event_handler = 0);
+               ACE_Event_Handler *event_handler = 0);
 
   /**
    * Create @a n new processes with the same @a options.
@@ -196,7 +196,7 @@ public:
   int spawn_n (size_t n,
                ACE_Process_Options &options,
                pid_t *child_pids = 0,
-	       ACE_Event_Handler *event_Handler = 0);
+               ACE_Event_Handler *event_Handler = 0);
   //@}
 
   /**
diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp
index 4f313d1f069..e46b6e4422b 100644
--- a/ACE/ace/QoS/QoS_Session_Impl.cpp
+++ b/ACE/ace/QoS/QoS_Session_Impl.cpp
@@ -57,18 +57,18 @@ rsvp_callback (rapi_sid_t /* sid */,
   if (!flow_spec_list)
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "(%N|%l) Null flow_spec_list\n"));
+                  "(%N|%l) Null flow_spec_list\n"));
     }
   else
     {
       // Extended Legacy format.
       csxp = &flow_spec_list->specbody_qosx;
       if(!csxp)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "(%N|%l) Null csxp\n"),
-			    -1);
-	}
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                            "(%N|%l) Null csxp\n"),
+                            -1);
+        }
     }
 
   ACE_QoS ace_qos = qos_session->qos ();
@@ -82,139 +82,133 @@ rsvp_callback (rapi_sid_t /* sid */,
                     "No. of TSpecs received : %d %d\n",
                     flow_spec_no, &flow_spec_list->len));
 
-	ACE_Flow_Spec *receiving_fs = 0;
-
-	if (flow_spec_no != 0)
-	  {
-
-	    ACE_NEW_RETURN (receiving_fs,
-			    ACE_Flow_Spec,
-			    -1);
-
-	    ACE_NEW_RETURN (receiving_fs,
-			    ACE_Flow_Spec ((u_long)csxp->xspec_r,
-					   (u_long)csxp->xspec_b,
-					   (u_long)csxp->xspec_p,
-					   0,
-					   csxp->xspec_S,
-					   1,
-					   csxp->xspec_M,
-					   csxp->xspec_m,
-					   25,
-					   0),
-			    -1);
-
-
-	    ACE_DEBUG ((LM_DEBUG,
-			"\nTSpec :\n"
-			"\t Spec Type = %d\n"
-			"\t Rate = %f\n"
-			"\t Bucket = %f\n"
-			"\t Peak = %f\n"
-			"\t MPU = %d\n"
-			"\t MDU = %d\n"
-			"\t TTL = %d\n",
-			csxp->spec_type,
-			csxp->xspec_r,
-			csxp->xspec_b,
-			csxp->xspec_p,
-			csxp->xspec_m,
-			csxp->xspec_M,
-			25));
-
-	  }
-	// Set the sending flowspec QoS of the given session.
-	ace_qos.receiving_flowspec (receiving_fs);
-
-	qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_PATH_EVENT);
-
+        ACE_Flow_Spec *receiving_fs = 0;
+
+        if (flow_spec_no != 0)
+          {
+            ACE_NEW_RETURN (receiving_fs,
+                            ACE_Flow_Spec,
+                            -1);
+
+            ACE_NEW_RETURN (receiving_fs,
+                            ACE_Flow_Spec ((u_long)csxp->xspec_r,
+                                           (u_long)csxp->xspec_b,
+                                           (u_long)csxp->xspec_p,
+                                           0,
+                                           csxp->xspec_S,
+                                           1,
+                                           csxp->xspec_M,
+                                           csxp->xspec_m,
+                                           25,
+                                           0),
+                            -1);
+
+            ACE_DEBUG ((LM_DEBUG,
+                        "\nTSpec :\n"
+                        "\t Spec Type = %d\n"
+                        "\t Rate = %f\n"
+                        "\t Bucket = %f\n"
+                        "\t Peak = %f\n"
+                        "\t MPU = %d\n"
+                        "\t MDU = %d\n"
+                        "\t TTL = %d\n",
+                        csxp->spec_type,
+                        csxp->xspec_r,
+                        csxp->xspec_b,
+                        csxp->xspec_p,
+                        csxp->xspec_m,
+                        csxp->xspec_M,
+                        25));
+          }
+
+        // Set the sending flowspec QoS of the given session.
+        ace_qos.receiving_flowspec (receiving_fs);
+
+        qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_PATH_EVENT);
       }
-
     break;
 
     case RAPI_RESV_EVENT:
       {
-	ACE_DEBUG ((LM_DEBUG,
-		    "RSVP RESV Event received\n"
-		    "No. of FlowSpecs received : %d\n",
-		    flow_spec_no));
-
-	ACE_Flow_Spec *sending_flow = 0;
-
-	if (flow_spec_no != 0)
-	  {
-	    ACE_NEW_RETURN (sending_flow,
-			    ACE_Flow_Spec,
-			    -1);
-
-	    // Choose based on the service type : [QOS_GUARANTEEDX/QOS_CNTR_LOAD].
-	    switch (csxp->spec_type)
-	      {
-	      case QOS_GUARANTEEDX:
-		// Slack term in MICROSECONDS
-		sending_flow->delay_variation (csxp->xspec_S);
-
-		// @@How does the guaranteed rate parameter map to the ACE_Flow_Spec.
-		// Note there is no break !!
-
-	      case QOS_CNTR_LOAD:
-
-		// qos_service_type.
-		sending_flow->service_type (csxp->spec_type);
-		// Token Bucket Average Rate (B/s)
-		sending_flow->token_rate ((u_long)csxp->xspec_r);
-		// Token Bucket Rate (B)
-		sending_flow->token_bucket_size ((u_long)csxp->xspec_b);
-		// Peak Data Rate (B/s)
-		sending_flow->peak_bandwidth ((u_long)csxp->xspec_p);
-		// Minimum Policed Unit (B)
-		sending_flow->minimum_policed_size (csxp->xspec_m);
-		// Max Packet Size (B)
-		sending_flow->max_sdu_size (csxp->xspec_M);
-
-		break;
-
-	      default:
-		ACE_ERROR_RETURN ((LM_ERROR,
-				   "(%N|%l) Unknown flowspec type: %u.\n", csxp->spec_type),
-				  -1);
-	      };
-	  }
-	ace_qos.sending_flowspec (sending_flow);
-
-	qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_EVENT);
+        ACE_DEBUG ((LM_DEBUG,
+                    "RSVP RESV Event received\n"
+                    "No. of FlowSpecs received : %d\n",
+                    flow_spec_no));
+
+        ACE_Flow_Spec *sending_flow = 0;
+
+        if (flow_spec_no != 0)
+          {
+            ACE_NEW_RETURN (sending_flow,
+                            ACE_Flow_Spec,
+                            -1);
+
+            // Choose based on the service type : [QOS_GUARANTEEDX/QOS_CNTR_LOAD].
+            switch (csxp->spec_type)
+              {
+              case QOS_GUARANTEEDX:
+                // Slack term in MICROSECONDS
+                sending_flow->delay_variation (csxp->xspec_S);
+
+                // @@How does the guaranteed rate parameter map to the ACE_Flow_Spec.
+                // Note there is no break !!
+
+              case QOS_CNTR_LOAD:
+                // qos_service_type.
+                sending_flow->service_type (csxp->spec_type);
+                // Token Bucket Average Rate (B/s)
+                sending_flow->token_rate ((u_long)csxp->xspec_r);
+                // Token Bucket Rate (B)
+                sending_flow->token_bucket_size ((u_long)csxp->xspec_b);
+                // Peak Data Rate (B/s)
+                sending_flow->peak_bandwidth ((u_long)csxp->xspec_p);
+                // Minimum Policed Unit (B)
+                sending_flow->minimum_policed_size (csxp->xspec_m);
+                // Max Packet Size (B)
+                sending_flow->max_sdu_size (csxp->xspec_M);
+                break;
+
+              default:
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                  "(%N|%l) Unknown flowspec type: %u.\n", csxp->spec_type),
+                                  -1);
+            }
+          }
+
+        ace_qos.sending_flowspec (sending_flow);
+        qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_EVENT);
       }
       break;
 
     case RAPI_PATH_ERROR:
       {
-	ACE_DEBUG ((LM_DEBUG,
-		    "PATH ERROR Event received\n"
-		    "Code=%d  Val=%d  Node= %s\n",
-		    errcode,
-		    errvalue,
-		    ACE_OS::inet_ntoa(((sockaddr_in *)errnode)->sin_addr)));
-	qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_PATH_ERROR);
+        ACE_DEBUG ((LM_DEBUG,
+                    "PATH ERROR Event received\n"
+                    "Code=%d  Val=%d  Node= %s\n",
+                    errcode,
+                    errvalue,
+                    ACE_OS::inet_ntoa(((sockaddr_in *)errnode)->sin_addr)));
+        qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_PATH_ERROR);
       }
       break;
 
     case RAPI_RESV_ERROR:
       {
-	ACE_DEBUG ((LM_DEBUG,
-		    "RESV ERROR Event received\n"
-		    "Code=%d  Val=%d  Node= %s\n",
-		    errcode,
-		    errvalue,
-		    ACE_OS::inet_ntoa(((sockaddr_in *)errnode)->sin_addr)));
-	qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_ERROR);
+        ACE_DEBUG ((LM_DEBUG,
+                    "RESV ERROR Event received\n"
+                    "Code=%d  Val=%d  Node= %s\n",
+                    errcode,
+                    errvalue,
+                    ACE_OS::inet_ntoa(((sockaddr_in *)errnode)->sin_addr)));
+        qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_ERROR);
       }
       break;
 
     case RAPI_RESV_CONFIRM:
       {
-	ACE_DEBUG ((LM_DEBUG,
-		    "RESV CONFIRM Event received\n"));
-	qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_CONFIRM);
+        ACE_DEBUG ((LM_DEBUG,
+                    "RESV CONFIRM Event received\n"));
+        qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_CONFIRM);
       }
       break;
 
@@ -238,7 +232,7 @@ ACE_RAPI_Session::ACE_RAPI_Session (void)
   ACE_TRACE ("ACE_RAPI_Session::ACE_RAPI_Session");
   //this->source_port (DEFAULT_SOURCE_SENDER_PORT);
   ACE_NEW (this->src_addr_,
-	   ACE_INET_Addr ("0"));
+           ACE_INET_Addr ("0"));
 }
 
 // Open a RAPI QoS session [dest IP, dest port, Protocol ID].
@@ -248,10 +242,10 @@ ACE_RAPI_Session::open (ACE_INET_Addr dest_addr,
 {
   char buf [BUFSIZ];
   dest_addr.addr_to_string (buf,
-			     BUFSIZ);
+                            BUFSIZ);
   ACE_DEBUG ((LM_DEBUG,
-	      "In RAPI SESSION OPEN %s\n",
-	      buf));
+              "In RAPI SESSION OPEN %s\n",
+              buf));
 
   this->dest_addr_ = dest_addr;
   this->protocol_id_ = protocol_id;
@@ -338,21 +332,21 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos)
   if (sending_flowspec == 0)
     {
       int result = rapi_sender (this->session_id_,
-				0,
-				0,
-				0,
-				0,
-				0,
-				0,
-				25) ;
+                                0,
+                                0,
+                                0,
+                                0,
+                                0,
+                                0,
+                                25);
       if (result != 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "(%N|%l) rapi_sender error %d:\n\tPATH Generation can't be started\n",
-			   result),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N|%l) rapi_sender error %d:\n\tPATH Generation can't be started\n",
+                           result),
+                          -1);
       else
-	ACE_DEBUG ((LM_DEBUG,
-		    "rapi_sender () call succeeds with PATH Tear! \n"));
+        ACE_DEBUG ((LM_DEBUG,
+                    "rapi_sender () call succeeds with PATH Tear! \n"));
 
       return 0;
     }
@@ -402,28 +396,28 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos)
 
 
   int result = rapi_sender(this->session_id_,
-			   0,
-			   (sockaddr *) this->src_addr_->get_addr (),
-			   0,
-			   t_spec,
-			   0,
-			   0,
-			   sending_flowspec->ttl ()) ;
+                           0,
+                           (sockaddr *) this->src_addr_->get_addr (),
+                           0,
+                           t_spec,
+                           0,
+                           0,
+                           sending_flowspec->ttl ()) ;
 
   /*
   int result = rapi_sender(this->session_id_,
-			   0,
-			   (sockaddr *) sender_addr.get_addr (),
-			   0,
-			   t_spec,
-			   0,
-			   0,
-			   sending_flowspec->ttl ()) ;
+                           0,
+                           (sockaddr *) sender_addr.get_addr (),
+                           0,
+                           t_spec,
+                           0,
+                           0,
+                           sending_flowspec->ttl ()) ;
   */
   if(result!= 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%N|%l) rapi_sender error %d:\n\tPATH Generation can't be started\n",
-		       result),
+                      result),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
@@ -440,29 +434,29 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos)
   if (receiving_flowspec == 0)
     {
       if (rapi_reserve(this->session_id_,
-		       0,
-		       // Setting the RAPI_REQ_CONFIRM flag requests confirmation
-		       // of the resevation, by means of a confirmation upcall of
-		       // type RAPI_RESV_CONFIRM.
-		       //                   (sockaddr *)receiver_addr.get_addr (),
-		       0,
-		       RAPI_RSTYLE_WILDCARD,
-		       // This applies the flowspec to all the senders. Given this,
-		       // @@I am passing the filter_spec to be null, hoping this will work.
-		       0,
-		       0,
-		       0,
-		       0,
-		       // The filter spec is NULL. This should work since the RSTYLE is
-		       // WILDCARD.
-		       0,
-		       0) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "(%N|%l)rapi_reserve () error:\n\tRESV Generation can't be started\n"),
-			  -1);
+                       0,
+                       // Setting the RAPI_REQ_CONFIRM flag requests confirmation
+                       // of the resevation, by means of a confirmation upcall of
+                       // type RAPI_RESV_CONFIRM.
+                       //                   (sockaddr *)receiver_addr.get_addr (),
+                       0,
+                       RAPI_RSTYLE_WILDCARD,
+                       // This applies the flowspec to all the senders. Given this,
+                       // @@I am passing the filter_spec to be null, hoping this will work.
+                       0,
+                       0,
+                       0,
+                       0,
+                       // The filter spec is NULL. This should work since the RSTYLE is
+                       // WILDCARD.
+                       0,
+                       0) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N|%l)rapi_reserve () error:\n\tRESV Generation can't be started\n"),
+                          -1);
       else
-	ACE_DEBUG ((LM_DEBUG,
-		    "rapi_reserve () for RESV Tear call succeeds \n"));
+        ACE_DEBUG ((LM_DEBUG,
+                    "rapi_reserve () for RESV Tear call succeeds \n"));
 
       return 0;
     }
diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c
index 4b5ddc69d77..9ad9cd27338 100644
--- a/ACE/ace/Rtems_init.c
+++ b/ACE/ace/Rtems_init.c
@@ -101,13 +101,11 @@ static struct rtems_bsdnet_ifconfig netdriver_config = {
 #else
 static struct rtems_bsdnet_ifconfig loopback_config = {
 #endif
-	"lo0",				/* name */
-	rtems_bsdnet_loopattach,	/* attach function */
-
-	0,				/* link to next interface */
-
-	"127.0.0.1",			/* IP address */
-	"255.0.0.0",			/* IP net mask */
+  "lo0",                    /* name */
+  rtems_bsdnet_loopattach,  /* attach function */
+  0,                        /* link to next interface */
+  "127.0.0.1",              /* IP address */
+  "255.0.0.0",              /* IP net mask */
 };
 #endif
 
@@ -116,29 +114,29 @@ static struct rtems_bsdnet_ifconfig loopback_config = {
  */
 #ifndef RTEMS_USE_LOOPBACK_ONLY
 static struct rtems_bsdnet_ifconfig netdriver_config = {
-	RTEMS_BSP_NETWORK_DRIVER_NAME,		/* name */
-	RTEMS_BSP_NETWORK_DRIVER_ATTACH,	/* attach function */
+  RTEMS_BSP_NETWORK_DRIVER_NAME,    /* name */
+  RTEMS_BSP_NETWORK_DRIVER_ATTACH,  /* attach function */
 
 #ifdef RTEMS_USE_LOOPBACK
-	&loopback_config,		/* link to next interface */
+  &loopback_config,  /* link to next interface */
 #else
-	0,				/* No more interfaces */
+  0,                 /* No more interfaces */
 #endif
 
 #if (defined (RTEMS_USE_BOOTP))
-	0,				/* BOOTP supplies IP address */
-	0,				/* BOOTP supplies IP net mask */
+  0,        /* BOOTP supplies IP address */
+  0,        /* BOOTP supplies IP net mask */
 #else
   "XXX.YYY.ZZZ.XYZ",   /* IP address */
-	"255.255.255.0",		/* IP net mask */
+  "255.255.255.0",     /* IP net mask */
 #endif /* !RTEMS_USE_BOOTP */
 
 #if (defined (RTEMS_SET_ETHERNET_ADDRESS))
-	ethernet_address,               /* Ethernet hardware address */
+  ethernet_address,    /* Ethernet hardware address */
 #else
-	0,                           /* Driver supplies hardware address */
+  0,                   /* Driver supplies hardware address */
 #endif
-	0				/* Use default driver parameters */
+  0                    /* Use default driver parameters */
 };
 #endif
 
@@ -146,37 +144,37 @@ static struct rtems_bsdnet_ifconfig netdriver_config = {
  * Network configuration
  */
 struct rtems_bsdnet_config rtems_bsdnet_config = {
-	&netdriver_config,
+  &netdriver_config,
 
 #if (defined (RTEMS_USE_BOOTP))
-	rtems_bsdnet_do_bootp,
+  rtems_bsdnet_do_bootp,
 #else
-	0,
+  0,
 #endif
 
-	0,			/* Default network task priority */
-	0,			/* Default mbuf capacity */
-	0,			/* Default mbuf cluster capacity */
+  0,      /* Default network task priority */
+  0,      /* Default mbuf capacity */
+  0,      /* Default mbuf cluster capacity */
 
 #if (!defined (RTEMS_USE_BOOTP))
-	"rtems_host",		/* Host name */
-	"nodomain.com",		/* Domain name */
-  "XXX.YYY.ZZZ.1", /* Gateway */
-	"XXX.YYY.ZZZ.1",	/* Log host */
-  {"XXX.YYY.ZZZ.1" },  /* Name server(s) */
-	{"XXX.YYY.ZZZ.1" },	/* NTP server(s) */
+  "rtems_host",       /* Host name */
+  "nodomain.com",     /* Domain name */
+  "XXX.YYY.ZZZ.1",    /* Gateway */
+  "XXX.YYY.ZZZ.1",    /* Log host */
+  {"XXX.YYY.ZZZ.1" }, /* Name server(s) */
+  {"XXX.YYY.ZZZ.1" }, /* NTP server(s) */
 
-	/*
-	 *  A real example -- DO NOT USE THIS YOURSELF!!!
-	 */
+  /*
+  *  A real example -- DO NOT USE THIS YOURSELF!!!
+  */
 
 #if 0
-	"dy4",			/* Host name */
-	"NOT_oarcorp.com",	/* Domain name */
-	"192.168.1.2",   	/* Gateway */
-	"192.168.1.2", 		/* Log host */
-	{"192.168.1.2" },	/* Name server(s) */
-	{"192.168.1.2" },	/* NTP server(s) */
+  "dy4",             /* Host name */
+  "NOT_oarcorp.com", /* Domain name */
+  "192.168.1.2",     /* Gateway */
+  "192.168.1.2",     /* Log host */
+  {"192.168.1.2" },  /* Name server(s) */
+  {"192.168.1.2" },  /* NTP server(s) */
 #endif
 #endif /* !RTEMS_USE_BOOTP */
 
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
index 22835661fee..ab9e7085050 100644
--- a/ACE/ace/SOCK_Dgram.cpp
+++ b/ACE/ace/SOCK_Dgram.cpp
@@ -91,7 +91,7 @@ ACE_SOCK_Dgram::recv (iovec *io_vec,
 
   if (ACE_OS::ioctl (this->get_handle (),
                      FIONREAD,
-		     &inlen) == -1)
+                     &inlen) == -1)
     return -1;
   else if (inlen > 0)
     {
diff --git a/ACE/ace/SOCK_IO.cpp b/ACE/ace/SOCK_IO.cpp
index 10dfe308df5..31d5db47dc6 100644
--- a/ACE/ace/SOCK_IO.cpp
+++ b/ACE/ace/SOCK_IO.cpp
@@ -85,9 +85,9 @@ ACE_SOCK_IO::recvv (iovec *io_vec,
       // don't want that value cast to unsigned and returned.
       ssize_t recv_len = this->recv (io_vec->iov_base, inlen);
       if (recv_len > 0)
-	// u_long is the Windows type; size_t is everyone else's. A u_long
-	// should go into a size_t anywhere without an issue.
-	io_vec->iov_len = static_cast<u_long> (recv_len);
+        // u_long is the Windows type; size_t is everyone else's. A u_long
+        // should go into a size_t anywhere without an issue.
+        io_vec->iov_len = static_cast<u_long> (recv_len);
       return recv_len;
     }
   else
diff --git a/ACE/ace/SPIPE_Acceptor.cpp b/ACE/ace/SPIPE_Acceptor.cpp
index b9b5d145dad..285ddb2438d 100644
--- a/ACE/ace/SPIPE_Acceptor.cpp
+++ b/ACE/ace/SPIPE_Acceptor.cpp
@@ -91,9 +91,9 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
                           I_PUSH,
                           module) == -1)
     return -1;
-  else if (-1 == ACE_OS::fattach
-	           (spipe[0],
-		    ACE_TEXT_ALWAYS_CHAR (this->local_addr_.get_path_name ())))
+  else if (-1 == ACE_OS::fattach(spipe[0],
+                                 ACE_TEXT_ALWAYS_CHAR (
+                                   this->local_addr_.get_path_name ())))
     return -1;
 
   this->set_duplex_handle (spipe[0]);
diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp
index dc1681a4a6b..246d6c7b0bd 100644
--- a/ACE/ace/Select_Reactor_Base.cpp
+++ b/ACE/ace/Select_Reactor_Base.cpp
@@ -610,9 +610,9 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r,
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
       if (notification_queue_.open() == -1)
-	{
-	  return -1;
-	}
+        {
+          return -1;
+        }
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
       // There seems to be a Win32 bug with this...  Set this into
@@ -650,12 +650,12 @@ ACE_Select_Reactor_Notify::close (void)
       // pipe....
       ACE_Notification_Buffer b;
       for (int r = read_notify_pipe(notification_pipe_.read_handle(), b);
-	   r > 0;
-	   r = read_notify_pipe(notification_pipe_.read_handle(), b))
-	{
-	  if (b.eh_ == 0) continue;
-	  b.eh_->remove_reference();
-	}
+           r > 0;
+           r = read_notify_pipe(notification_pipe_.read_handle(), b))
+        {
+          if (b.eh_ == 0) continue;
+          b.eh_->remove_reference();
+        }
     }
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
@@ -782,8 +782,9 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
   bool more_messages_queued = false;
   ACE_Notification_Buffer next;
 
-  result = notification_queue_.pop_next_notification(
-	     buffer, more_messages_queued, next);
+  result = notification_queue_.pop_next_notification(buffer, 
+                                                     more_messages_queued, 
+                                                     next);
 
   if (result == 0)
     {
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index 5db4d8d0746..aa753c1881c 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -140,7 +140,7 @@ public:
 /// up. Note that the tss_ member will be destroyed with the
 /// ACE_Object_Manager's ACE_Service_Config singleton, so no leaks
 /// will be introduced.
-/// We need this non-ownership ACE_TSS because the SC instance is 
+/// We need this non-ownership ACE_TSS because the SC instance is
 /// really owned by the Object Manager and only it must do the cleanup.
 ///
 /// Naturally, things would be simpler, if we could
@@ -151,14 +151,14 @@ public:
 /// called before ~ACE_Object_Manager.
 
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-// Since ACE_TSS<>::cleanup() is only defined in 
+// Since ACE_TSS<>::cleanup() is only defined in
 // multithreaded builds ...
 template<> inline void
 ACE_TSS<ACE_Service_Gestalt>::cleanup (void*ptr)
 {
-	// Borland C++ 2007 *needs* the parameter 
-	// name, but it is not clear why ...
-	ACE_UNUSED_ARG (ptr);
+  // Borland C++ 2007 *needs* the parameter
+  // name, but it is not clear why ...
+  ACE_UNUSED_ARG (ptr);
 }
 # else
 template<> inline
diff --git a/ACE/ace/config-vxworks5.x.h b/ACE/ace/config-vxworks5.x.h
index efa8a2e5915..ca865772ceb 100644
--- a/ACE/ace/config-vxworks5.x.h
+++ b/ACE/ace/config-vxworks5.x.h
@@ -37,8 +37,8 @@
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
 # if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
-	// GNU 3.3+ toolchain supports long long types but fails to define this so STL
-	// skips some definitions
+  // GNU 3.3+ toolchain supports long long types but fails to define this so STL
+  // skips some definitions
 #   if !defined (_GLIBCPP_USE_LONG_LONG)
 #     define _GLIBCPP_USE_LONG_LONG
 #   endif
diff --git a/ACE/ace/config-vxworks6.2.h b/ACE/ace/config-vxworks6.2.h
index bbb033333e5..c49e1b768f4 100644
--- a/ACE/ace/config-vxworks6.2.h
+++ b/ACE/ace/config-vxworks6.2.h
@@ -39,8 +39,8 @@
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
 # if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
-	// GNU 3.3+ toolchain supports long long types but fails to define this so STL
-	// skips some definitions
+  // GNU 3.3+ toolchain supports long long types but fails to define this so STL
+  // skips some definitions
 #   if !defined (_GLIBCPP_USE_LONG_LONG)
 #     define _GLIBCPP_USE_LONG_LONG
 #   endif
diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h
index 309be4cf97d..1ee4aaa6d1c 100644
--- a/ACE/ace/config-vxworks6.3.h
+++ b/ACE/ace/config-vxworks6.3.h
@@ -29,8 +29,8 @@
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
 # if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
-	// GNU 3.3+ toolchain supports long long types but fails to define this so STL
-	// skips some definitions
+  // GNU 3.3+ toolchain supports long long types but fails to define this so STL
+  // skips some definitions
 #   if !defined (_GLIBCPP_USE_LONG_LONG)
 #     define _GLIBCPP_USE_LONG_LONG
 #   endif
diff --git a/ACE/ace/os_include/sys/os_socket.h b/ACE/ace/os_include/sys/os_socket.h
index f944b53c7d2..01f0de3e507 100644
--- a/ACE/ace/os_include/sys/os_socket.h
+++ b/ACE/ace/os_include/sys/os_socket.h
@@ -281,7 +281,7 @@ extern "C"
                           struct timespec *timeout);
 
   ssize_t sendmsg_timedwait (ACE_HANDLE handle,
-			     const struct msghdr *msg,
+                             const struct msghdr *msg,
                              int flags,
                              struct timespec *timeout);