*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)

*Fix a possible crash in Spell::DoAllEffectOnTarget

--HG--
branch : trunk

1 files changed, 0 insertions, 46 deletions

diff --git a/dep/ACE_wrappers/ace/Task.cpp b/dep/ACE_wrappers/ace/Task.cpp
index 3746b735811..f96708389cf 100644
--- a/dep/ACE_wrappers/ace/Task.cpp
+++ b/dep/ACE_wrappers/ace/Task.cpp
@@ -1,19 +1,14 @@
 // $Id: Task.cpp 80826 2008-03-04 14:51:23Z wotte $
-
 #include "ace/Task.h"
 #include "ace/Module.h"
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Task.inl"
 #endif /* __ACE_INLINE__ */
 
-
 ACE_RCSID (ace,
            Task,
            "$Id: Task.cpp 80826 2008-03-04 14:51:23Z wotte $")
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man)
   : thr_count_ (0),
     thr_mgr_ (thr_man),
@@ -27,63 +22,49 @@ ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man)
    ACE_OS::memset( &this->last_thread_id_, '\0', sizeof( this->last_thread_id_ ));
 #endif /* defined (ACE_MVS) */
 }
-
 ACE_Task_Base::~ACE_Task_Base (void)
 {
 }
-
 // Default ACE_Task service routine
-
 int
 ACE_Task_Base::svc (void)
 {
   ACE_TRACE ("ACE_Task_Base::svc");
   return 0;
 }
-
 // Default ACE_Task open routine
-
 int
 ACE_Task_Base::open (void *)
 {
   ACE_TRACE ("ACE_Task_Base::open");
   return 0;
 }
-
 // Default ACE_Task close routine
-
 int
 ACE_Task_Base::close (u_long)
 {
   ACE_TRACE ("ACE_Task_Base::close");
   return 0;
 }
-
 // Forward the call to close() so that existing applications don't
 // break.
-
 int
 ACE_Task_Base::module_closed (void)
 {
   return this->close (1);
 }
-
 // Default ACE_Task put routine.
-
 int
 ACE_Task_Base::put (ACE_Message_Block *, ACE_Time_Value *)
 {
   ACE_TRACE ("ACE_Task_Base::put");
   return 0;
 }
-
 // Wait for all threads running in a task to exit.
-
 int
 ACE_Task_Base::wait (void)
 {
   ACE_TRACE ("ACE_Task_Base::wait");
-
   // If we don't have a thread manager, we probably were never
   // activated.
   if (this->thr_mgr () != 0)
@@ -91,7 +72,6 @@ ACE_Task_Base::wait (void)
   else
     return 0;
 }
-
 // Suspend a task.
 int
 ACE_Task_Base::suspend (void)
@@ -100,10 +80,8 @@ ACE_Task_Base::suspend (void)
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
   if (this->thr_count_ > 0)
     return this->thr_mgr_->suspend_task (this);
-
   return 0;
 }
-
 // Resume a suspended task.
 int
 ACE_Task_Base::resume (void)
@@ -112,10 +90,8 @@ ACE_Task_Base::resume (void)
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
   if (this->thr_count_ > 0)
     return this->thr_mgr_->resume_task (this);
-
   return 0;
 }
-
 int
 ACE_Task_Base::activate (long flags,
                          int n_threads,
@@ -130,14 +106,11 @@ ACE_Task_Base::activate (long flags,
                          const char* thr_name[])
 {
   ACE_TRACE ("ACE_Task_Base::activate");
-
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
-
   // If the task passed in is zero, we will use <this>
   if (task == 0)
     task = this;
-
   if (this->thr_count_ > 0 && force_active == 0)
     return 1; // Already active.
   else
@@ -148,7 +121,6 @@ ACE_Task_Base::activate (long flags,
         grp_id = this->grp_id_;
       this->thr_count_ += n_threads;
     }
-
   // Use the ACE_Thread_Manager singleton if we're running as an
   // active object and the caller didn't supply us with a
   // Thread_Manager.
@@ -158,7 +130,6 @@ ACE_Task_Base::activate (long flags,
 # else /* ! ACE_THREAD_MANAGER_LACKS_STATICS */
     this->thr_mgr_ = ACE_Thread_Manager::instance ();
 # endif /* ACE_THREAD_MANAGER_LACKS_STATICS */
-
   int grp_spawned = -1;
   if (thread_ids == 0)
     // Thread Ids were not specified
@@ -195,18 +166,14 @@ ACE_Task_Base::activate (long flags,
       this->thr_count_ -= n_threads;
       return -1;
     }
-
   if (this->grp_id_ == -1)
     this->grp_id_ = grp_spawned;
-
 #if defined (ACE_MVS) || defined(__TANDEM)
   ACE_OS::memcpy( &this->last_thread_id_, '\0', sizeof(this->last_thread_id_));
 #else
   this->last_thread_id_ = 0;    // Reset to prevent inadvertant match on ID
 #endif /* defined (ACE_MVS) */
-
   return 0;
-
 #else
   {
     // Keep the compiler from complaining.
@@ -225,12 +192,10 @@ ACE_Task_Base::activate (long flags,
   }
 #endif /* ACE_MT_SAFE */
 }
-
 void
 ACE_Task_Base::cleanup (void *object, void *)
 {
   ACE_Task_Base *t = (ACE_Task_Base *) object;
-
   // The thread count must be decremented first in case the <close>
   // hook does something crazy like "delete this".
   {
@@ -239,13 +204,11 @@ ACE_Task_Base::cleanup (void *object, void *)
     if (0 == t->thr_count_)
       t->last_thread_id_ = ACE_Thread::self ();
   }
-
   // @@ Is it possible to pass in the exit status somehow?
   t->close ();
   // t is undefined here. close() could have deleted it.
 }
 
-
 #if defined (ACE_HAS_SIG_C_FUNC)
 extern "C" void
 ACE_Task_Base_cleanup (void *object, void *)
@@ -253,24 +216,19 @@ ACE_Task_Base_cleanup (void *object, void *)
   ACE_Task_Base::cleanup (object, 0);
 }
 #endif /* ACE_HAS_SIG_C_FUNC */
-
 ACE_THR_FUNC_RETURN
 ACE_Task_Base::svc_run (void *args)
 {
   ACE_TRACE ("ACE_Task_Base::svc_run");
-
   ACE_Task_Base *t = (ACE_Task_Base *) args;
-
   // Register ourself with our <Thread_Manager>'s thread exit hook
   // mechanism so that our close() hook will be sure to get invoked
   // when this thread exits.
-
 #if defined ACE_HAS_SIG_C_FUNC
   t->thr_mgr ()->at_exit (t, ACE_Task_Base_cleanup, 0);
 #else
   t->thr_mgr ()->at_exit (t, ACE_Task_Base::cleanup, 0);
 #endif /* ACE_HAS_SIG_C_FUNC */
-
   // Call the Task's svc() hook method.
   int const svc_status = t->svc ();
   ACE_THR_FUNC_RETURN status;
@@ -280,21 +238,17 @@ ACE_Task_Base::svc_run (void *args)
 #else
   status = reinterpret_cast<ACE_THR_FUNC_RETURN> (svc_status);
 #endif /* ACE_HAS_INTEGRAL_TYPE_THR_FUNC_RETURN */
-
 // If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke
 #if 1
   // Call the <Task->close> hook.
   ACE_Thread_Manager *thr_mgr_ptr = t->thr_mgr ();
-
   // This calls the Task->close () hook.
   t->cleanup (t, 0);
-
   // This prevents a second invocation of the cleanup code
   // (called later by <ACE_Thread_Manager::exit>.
   thr_mgr_ptr->at_exit (t, 0, 0);
 #endif
   return status;
 }
-
 ACE_END_VERSIONED_NAMESPACE_DECL