Tue Jun 9 23:17:14 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>

        * utils/logWalker/HostProcess.cpp:
        * utils/logWalker/Invocation.cpp:
        * utils/logWalker/Log.cpp:
        * utils/logWalker/PeerProcess.cpp:
        * utils/logWalker/Thread.cpp:
        * utils/logWalker/logWalker.cpp:
        * utils/logWalker/logWalker.mpc:
        
          Fuzz fix.

8 files changed, 316 insertions, 303 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 18f8b78108c..67a0aa90da4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,9 +1,21 @@
+Tue Jun  9 23:17:14 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * utils/logWalker/HostProcess.cpp:
+        * utils/logWalker/Invocation.cpp:
+        * utils/logWalker/Log.cpp:
+        * utils/logWalker/PeerProcess.cpp:
+        * utils/logWalker/Thread.cpp:
+        * utils/logWalker/logWalker.cpp:
+        * utils/logWalker/logWalker.mpc:
+        
+          Fuzz fix.
+
 Tue Jun  9 22:26:07 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * utils/README:
         * utils/logWalker:
         * NEWS:
-        
+
           Adding a new utility for parsing TAO debug log files.
 
 Tue Jun  9 22:04:49 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
@@ -13,7 +25,7 @@ Tue Jun  9 22:04:49 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
         * TAO_IDL/contrib/mcpp/system.cpp:
 
           Compile warning fixes.
-        
+
 Tue Jun  9 21:01:30 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * TAO_IDL/contrib/mcpp/directive.cpp:
diff --git a/TAO/utils/logWalker/HostProcess.cpp b/TAO/utils/logWalker/HostProcess.cpp
index 27a979e1bf8..2221250c1d8 100644
--- a/TAO/utils/logWalker/HostProcess.cpp
+++ b/TAO/utils/logWalker/HostProcess.cpp
@@ -119,8 +119,8 @@ HostProcess::add_peer(PeerProcess *peer, bool as_client)
   if (existing != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "add_peer, found existing for %d, is_closed = %d\n",
-		  peer->handle(), existing->is_closed()));
+                  "add_peer, found existing for %d, is_closed = %d\n",
+                  peer->handle(), existing->is_closed()));
     }
   PeerProcs *list = as_client ? &clients_ : &servers_;
   long handle = peer->handle();
@@ -155,15 +155,15 @@ HostProcess::dump_summary (ostream &strm)
       strm << "  listening on ";
       size_t count = 0;
       for (ACE_DLList_Iterator <ACE_CString> t_iter (this->endpoints_);
-	   !t_iter.done();
-	   t_iter.advance())
-	{
-	  ACE_CString *ep;
-	  t_iter.next(ep);
-	  strm << ep->c_str();
-	  if (++count < num)
-	    strm << ", ";
-	}
+           !t_iter.done();
+           t_iter.advance())
+        {
+          ACE_CString *ep;
+          t_iter.next(ep);
+          strm << ep->c_str();
+          if (++count < num)
+            strm << ", ";
+        }
       strm << endl;
     }
   
@@ -222,26 +222,26 @@ HostProcess::dump_detail_list(ostream &strm, PeerProcs &list, int mode, Session
       if (i.next(entry) == 0)
         break;
       if (entry->item() == 0)
-	break;
+        break;
       switch (mode)
-	{
-	case 0:
-	  entry->item()->dump_summary (strm);
-	  break;
-	case 1:
-	  entry->item()->dump_object_detail (strm);
-	  strm << endl;
-	  break;
-	case 2:
-	  if (!first)
-	    this->dump_ident (strm,"Invocations continued");
-	  entry->item()->dump_invocation_detail (strm);
-	  strm << endl;
-	  break;
-	case 3:
-	  entry->item()->match_hosts (session);
-	  break;
-	}
+        {
+        case 0:
+          entry->item()->dump_summary (strm);
+          break;
+        case 1:
+          entry->item()->dump_object_detail (strm);
+          strm << endl;
+          break;
+        case 2:
+          if (!first)
+            this->dump_ident (strm,"Invocations continued");
+          entry->item()->dump_invocation_detail (strm);
+          strm << endl;
+          break;
+        case 3:
+          entry->item()->match_hosts (session);
+          break;
+        }
       first = false;
     }
 }
diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp
index 0467cbe9054..06e03472625 100644
--- a/TAO/utils/logWalker/Invocation.cpp
+++ b/TAO/utils/logWalker/Invocation.cpp
@@ -37,9 +37,9 @@ static const size_t target_offset = giop_header_len + 12;
 // 12 = req_id + flags + RESVD + addr disp.
 
 Invocation::GIOP_Buffer::GIOP_Buffer(const char *text, 
-				     size_t offset,
-				     Thread *thread,
-				     Invocation *owner)
+                                     size_t offset,
+                                     Thread *thread,
+                                     Invocation *owner)
   : preamble_(text),
     log_offset_(offset),
     thr_(thread),
@@ -68,13 +68,13 @@ Invocation::GIOP_Buffer::GIOP_Buffer(const char *text,
       timebuf[time_tok - text] = 0;
       char *hms = ACE_OS::strchr (timebuf,' ');
       if (hms != 0)
-	hms = ACE_OS::strchr (hms + 1, ' ');
+        hms = ACE_OS::strchr (hms + 1, ' ');
       if (hms != 0)
-	{
-	  int hr, min, sec, msec;
+        {
+          int hr, min, sec, msec;
           ::sscanf (hms+1,"%d:%d:%d.%d", &hr, &min, &sec, &msec);
-	  this->time_ = (hr * 3600 + min *60 + sec) * 1000 + msec;
-	}
+          this->time_ = (hr * 3600 + min *60 + sec) * 1000 + msec;
+        }
     }
 }
 
@@ -405,7 +405,7 @@ Invocation::message_complete (void)
   if (this->is_oneway())
     {
       if (this->req_octets_ == 0 || !this->req_octets_->is_full())
-	return false;
+        return false;
     }
   else
     if (this->repl_octets_ == 0 || !this->repl_octets_->is_full())
@@ -438,17 +438,17 @@ Invocation::set_octets (bool request, GIOP_Buffer *octets)
   if (request)
     {
       if (this->req_octets_ != 0)
-	{
-	  return;
-	}
+        {
+          return;
+        }
       this->req_octets_ = octets;
     }
   else
     {
       if (this->repl_octets_ != 0)
-	{
-	  return;
-	}
+        {
+          return;
+        }
       this->repl_octets_ = octets;
     }
   octets->owner(this);
@@ -513,10 +513,10 @@ Invocation::dump_detail (ostream &strm, int indent)
     {
       opname = this->req_octets_->operation();
       if (this->req_octets_->sending())
-	{
-	  dir_1 = " for ";
-	  dir_2 = " from ";
-	}
+        {
+          dir_1 = " for ";
+          dir_2 = " from ";
+        }
     }
 
   for (int ind = 0; ind < indent; ind++)
@@ -539,10 +539,10 @@ Invocation::dump_detail (ostream &strm, int indent)
     {
       req_time = this->req_octets_->time();
       if (this->repl_octets_ != 0)
-	{
-	  rep_time = this->repl_octets_->time();
-	  delta = this->repl_octets_->log_posn() - this->req_octets_->log_posn();
-	}
+        {
+          rep_time = this->repl_octets_->time();
+          delta = this->repl_octets_->log_posn() - this->req_octets_->log_posn();
+        }
     }
   if (req_time != 0 && rep_time != 0)
     strm << " took " << (rep_time - req_time) << " ms";
@@ -561,14 +561,14 @@ Invocation::dump_detail (ostream &strm, int indent)
   else
     {
       if (this->repl_octets_ != 0)
-	{
-	  strm << " Reply, line " << this->repl_octets_->log_posn();
+        {
+          strm << " Reply, line " << this->repl_octets_->log_posn();
 #if defined (SHOW_THREAD_ID)
-	  strm << " " << this->repl_octets_->thread()->alias();
+          strm << " " << this->repl_octets_->thread()->alias();
 #endif
-	}
+        }
       else
-	strm << " <no reply found>";
+        strm << " <no reply found>";
     }
   if (delta > 0)
     strm << " log offset = " << delta;
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index ef103e7a00d..6408f139b9f 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -108,26 +108,26 @@ Log::get_host (long pid)
   if (this->alias_.length() > 0)
     {
       switch (numprocs)
-	{
-	case 0:
-	  hp->proc_name(alias_);
-	  break;
-	case 1:
-	  {
-	    ACE_CString a2 = alias_ + "_1";
-	    HostProcess *first;
-	    if (this->procs_.get(first) == 0)
-	      first->proc_name(a2);
-	  }
-	  //fallthru
-	default:
-	  {
-	    char ext[10];
-	    ACE_OS::sprintf(ext,"_%d",numprocs+1);
-	    ACE_CString a2 = alias_ + ext;
-	    hp->proc_name(a2);
-	  }
-	}
+        {
+        case 0:
+          hp->proc_name(alias_);
+          break;
+        case 1:
+          {
+            ACE_CString a2 = alias_ + "_1";
+            HostProcess *first;
+            if (this->procs_.get(first) == 0)
+              first->proc_name(a2);
+          }
+          //fallthru
+        default:
+          {
+            char ext[10];
+            ACE_OS::sprintf(ext,"_%d",numprocs+1);
+            ACE_CString a2 = alias_ + ext;
+            hp->proc_name(a2);
+          }
+        }
     }
   this->session_.add_process(hp);
   return hp;
@@ -163,58 +163,58 @@ Log::parse_line (char *line, size_t offset)
     {
       int pos = this->dump_target_->add_octets(line);
       if (pos == 1) // need to validate target
-	{
-	  if (!this->dump_target_->validate())
-	    {
-	      for (ACE_DLList_Iterator<Thread> t_iter(this->giop_waiters_);
-		   !t_iter.done();
-		   t_iter.advance())
-		{
-		  Thread *th = 0;
-		  t_iter.next(th);
-		  Invocation::GIOP_Buffer *new_target = th->giop_target();
-		  if (new_target == 0 || new_target == this->dump_target_)
-		    continue;
-		  if (new_target->matches (this->dump_target_))
-		    {
-		      new_target->transfer_from (this->dump_target_);
-		      this->dump_target_ = new_target;
-		      th->exit_wait(th->incoming(), offset);
-		      t_iter.remove();
-		      break;
-		    }
-		}
-	    }
-	  else
-	    {
-	      for (ACE_DLList_Iterator<Thread> t_iter(this->giop_waiters_);
-		   !t_iter.done();
-		   t_iter.advance())
-		{
-		  Thread *th = 0;
-		  t_iter.next(th);
-		  if (this->dump_target_ == th->giop_target())
-		    {
-		      th->exit_wait(th->incoming(), offset);
-		      t_iter.remove();
-		      break;
-		    }
-		}
-	    }
-	}
+        {
+          if (!this->dump_target_->validate())
+            {
+              for (ACE_DLList_Iterator<Thread> t_iter(this->giop_waiters_);
+                   !t_iter.done();
+                   t_iter.advance())
+                {
+                  Thread *th = 0;
+                  t_iter.next(th);
+                  Invocation::GIOP_Buffer *new_target = th->giop_target();
+                  if (new_target == 0 || new_target == this->dump_target_)
+                    continue;
+                  if (new_target->matches (this->dump_target_))
+                    {
+                      new_target->transfer_from (this->dump_target_);
+                      this->dump_target_ = new_target;
+                      th->exit_wait(th->incoming(), offset);
+                      t_iter.remove();
+                      break;
+                    }
+                }
+            }
+          else
+            {
+              for (ACE_DLList_Iterator<Thread> t_iter(this->giop_waiters_);
+                   !t_iter.done();
+                   t_iter.advance())
+                {
+                  Thread *th = 0;
+                  t_iter.next(th);
+                  if (this->dump_target_ == th->giop_target())
+                    {
+                      th->exit_wait(th->incoming(), offset);
+                      t_iter.remove();
+                      break;
+                    }
+                }
+            }
+        }
       else if (pos == -1) // done
-	{
-	  Invocation *inv = this->dump_target_->owner();
-	  if (inv != 0)
-	    {
-	      size_t len = 0;
-	      const char *oid = this->dump_target_->target_oid(len);
-	      if (oid != 0)
-		inv->set_target (oid, len);
-	    }
+        {
+          Invocation *inv = this->dump_target_->owner();
+          if (inv != 0)
+            {
+              size_t len = 0;
+              const char *oid = this->dump_target_->target_oid(len);
+              if (oid != 0)
+                inv->set_target (oid, len);
+            }
 
-	  this->dump_target_ = 0;
-	}
+          this->dump_target_ = 0;
+        }
       return;
     }
      
@@ -248,77 +248,77 @@ Log::parse_line (char *line, size_t offset)
         c = ACE_OS::strstr(c+1,"on ");
         long handle = ACE_OS::strtol(c + 3,0,10);
         PeerProcess *pp = thr->pending_peer();
-	if (pp == 0)
-	  {
-	    ACE_ERROR ((LM_ERROR,"no pending peer for file %s, line %d\n",
-			this->origin_.c_str(), offset));
-	    break;
-	  }
-	if (!pp->is_client())
-	  {
-	    pp->set_addr(addr,false);
-	  }
-	thr->pending_peer(0);
-	pp->handle(handle);
-	hp->add_peer(pp, pp->is_client());
+        if (pp == 0)
+          {
+            ACE_ERROR ((LM_ERROR,"no pending peer for file %s, line %d\n",
+                        this->origin_.c_str(), offset));
+            break;
+          }
+        if (!pp->is_client())
+          {
+            pp->set_addr(addr,false);
+          }
+        thr->pending_peer(0);
+        pp->handle(handle);
+        hp->add_peer(pp, pp->is_client());
         break;
       }
     case 2: //GIOP_Message_Base::dump_msg, 
       {
-	int mode = ACE_OS::strstr (line,"send") != 0 ? 0 : 1;
-	mode +=  ACE_OS::strstr (line,"Request") != 0 ? 0 : 2;
+        int mode = ACE_OS::strstr (line,"send") != 0 ? 0 : 1;
+        mode +=  ACE_OS::strstr (line,"Request") != 0 ? 0 : 2;
         char *pos = strrchr (line,'[');
         long rid = ACE_OS::strtol(pos+1, 0, 10);
         PeerProcess *pp = thr->incoming();
-	if (pp == 0)
-	  {
-	    ACE_ERROR((LM_ERROR,"dump_msg, could not find pp for incoming\n"));
-	    break;
-	  }
-	if (mode < 2)
-	  thr->enter_wait(pp);
-	Invocation::GIOP_Buffer *target = 0;
-	switch (mode) 
-	  {
-	  case 1: { // receiving request
-	    Invocation *inv = pp->new_invocation (rid);
-	    if (inv == 0)
-	      {
-		ACE_ERROR ((LM_ERROR,
-			    "process %d already has invocation "
-			    "%d, at line %d\n",
-			    pp->handle(), rid, offset));
-		break;
-	      }
-	    inv->init (line, offset, thr);
-	    target = inv->octets(true);
-	    break;
-	  }	    
-	  case 0: // sending request
-	  case 3: { // receiving reply
-	    Invocation *inv = pp->find_invocation(rid);
-	    if (inv == 0)
-	      {
-		ACE_ERROR ((LM_ERROR,"line %d, could not find existing invocation for req_id %d\n",
-			    offset, rid));
-		inv = pp->new_invocation (rid);
-	      }
-	    inv->init (line, offset, thr);
-	    target = inv->octets(mode == 0);
-	    if (mode == 3)
-	      thr->exit_wait(pp, offset);
-	    break;
-	  }
-	  case 2: { // sending reply
-	    target = new Invocation::GIOP_Buffer(line,offset, thr);
-	    break;
-	  }
-	  default:;
-	  }
+        if (pp == 0)
+          {
+            ACE_ERROR((LM_ERROR,"dump_msg, could not find pp for incoming\n"));
+            break;
+          }
+        if (mode < 2)
+          thr->enter_wait(pp);
+        Invocation::GIOP_Buffer *target = 0;
+        switch (mode) 
+          {
+          case 1: { // receiving request
+            Invocation *inv = pp->new_invocation (rid);
+            if (inv == 0)
+              {
+                ACE_ERROR ((LM_ERROR,
+                            "process %d already has invocation "
+                            "%d, at line %d\n",
+                            pp->handle(), rid, offset));
+                break;
+              }
+            inv->init (line, offset, thr);
+            target = inv->octets(true);
+            break;
+          }         
+          case 0: // sending request
+          case 3: { // receiving reply
+            Invocation *inv = pp->find_invocation(rid);
+            if (inv == 0)
+              {
+                ACE_ERROR ((LM_ERROR,"line %d, could not find existing invocation for req_id %d\n",
+                            offset, rid));
+                inv = pp->new_invocation (rid);
+              }
+            inv->init (line, offset, thr);
+            target = inv->octets(mode == 0);
+            if (mode == 3)
+              thr->exit_wait(pp, offset);
+            break;
+          }
+          case 2: { // sending reply
+            target = new Invocation::GIOP_Buffer(line,offset, thr);
+            break;
+          }
+          default:;
+          }
  
-	thr->set_giop_target (target);
+        thr->set_giop_target (target);
         this->giop_waiters_.insert_tail(thr);
-	break;
+        break;
       }
     case 3: // "GIOP message - HEXDUMP"
       {
@@ -330,12 +330,12 @@ Log::parse_line (char *line, size_t offset)
              t_iter.advance())
           {
             t_iter.next(thr);
-	    Invocation::GIOP_Buffer *target = thr->giop_target();
-	    if (target == 0 || target->expected_size() != len || target->size() > 0)
-	      continue;
-	    this->dump_target_ = target;
-	    break;
-	  }
+            Invocation::GIOP_Buffer *target = thr->giop_target();
+            if (target == 0 || target->expected_size() != len || target->size() > 0)
+              continue;
+            this->dump_target_ = target;
+            break;
+          }
         if (this->dump_target_ == 0)
           {
             ACE_ERROR ((LM_ERROR,
@@ -394,83 +394,83 @@ Log::parse_line (char *line, size_t offset)
       }
     case 7: // "wait_for_event"
       {
-	// thr->exit_wait()?
+        // thr->exit_wait()?
         break;
       }
     case 8: // cleanup_queue
       {
         char *hpos = ACE_OS::strchr(line,'[');
         long handle = ACE_OS::strtol(hpos+1,0,10);
-	PeerProcess *pp = hp->find_peer(handle);
-	Invocation::GIOP_Buffer *target = thr->giop_target();
-	thr->set_giop_target(0);
-	if (target != 0 && target->owner() == 0)
-	  {
-	    size_t rid = target->actual_req_id();
-	    char mtype = target->type();
-	    Invocation *inv = pp->find_invocation(rid);
-	    if (inv == 0)
-	      {
-		ACE_ERROR ((LM_ERROR,
-			    "Cleanup queue detected at line %d, "
-			    "could not find invocation for rid = %d\n", 
-			    offset, rid));
-		rid = target->expected_req_id();
-		inv = pp->find_invocation (rid);
-		if (inv == 0)
-		  {
-		    ACE_ERROR ((LM_ERROR,
-				"Cleanup queue still failed to find rid %d\n",
-				rid));
-		    break;
-		  }
-		thr->exit_wait(pp, offset);
-		mtype = target->expected_type();
-	      }
-	    inv->set_octets (mtype == 0, target);
-	    size_t len = 0;
-	    const char *oid = target->target_oid(len);
-	    if (mtype == 0 && len > 0)
-	      inv->set_target (oid, len);
-	  }
-	break;
+        PeerProcess *pp = hp->find_peer(handle);
+        Invocation::GIOP_Buffer *target = thr->giop_target();
+        thr->set_giop_target(0);
+        if (target != 0 && target->owner() == 0)
+          {
+            size_t rid = target->actual_req_id();
+            char mtype = target->type();
+            Invocation *inv = pp->find_invocation(rid);
+            if (inv == 0)
+              {
+                ACE_ERROR ((LM_ERROR,
+                            "Cleanup queue detected at line %d, "
+                            "could not find invocation for rid = %d\n", 
+                            offset, rid));
+                rid = target->expected_req_id();
+                inv = pp->find_invocation (rid);
+                if (inv == 0)
+                  {
+                    ACE_ERROR ((LM_ERROR,
+                                "Cleanup queue still failed to find rid %d\n",
+                                rid));
+                    break;
+                  }
+                thr->exit_wait(pp, offset);
+                mtype = target->expected_type();
+              }
+            inv->set_octets (mtype == 0, target);
+            size_t len = 0;
+            const char *oid = target->target_oid(len);
+            if (mtype == 0 && len > 0)
+              inv->set_target (oid, len);
+          }
+        break;
       }
     case 9: // close_connection_eh
       {
         char *hpos = ACE_OS::strchr(line,'[');
         long handle = ACE_OS::strtol(hpos+1,0,10);
-	hp->close_peer (handle,offset);
-	break;
+        hp->close_peer (handle,offset);
+        break;
       }
     case 10: // IIOP_Connector::begin_connection
       {
         char *addr = ACE_OS::strchr(line,'<') +1; 
         char *c = ACE_OS::strchr(addr,'>');
         *c = '\0';
-	thr->pending_peer (new PeerProcess(line,offset,true,addr,0));
-	break;
+        thr->pending_peer (new PeerProcess(line,offset,true,addr,0));
+        break;
       }
     case 11: // IIOP_Connection_Handler::open, The local addr is
       {
-	PeerProcess *peer = thr->pending_peer();
-	if (peer == 0)
-	  ACE_ERROR((LM_ERROR, "file %s, line %d, no pending client or server\n",
-		     this->origin_.c_str(), offset));
-	else
-	  {
-	    char *addr = ACE_OS::strchr(line,'<') +1; 
-	    char *c = ACE_OS::strchr(addr,'>');
-	    *c = '\0';
-	    peer->set_addr(addr, true);
-	    ACE_CString s_addr(addr);
-	    hp->add_endpoint(s_addr);
-	  }
-	break;
+        PeerProcess *peer = thr->pending_peer();
+        if (peer == 0)
+          ACE_ERROR((LM_ERROR, "file %s, line %d, no pending client or server\n",
+                     this->origin_.c_str(), offset));
+        else
+          {
+            char *addr = ACE_OS::strchr(line,'<') +1; 
+            char *c = ACE_OS::strchr(addr,'>');
+            *c = '\0';
+            peer->set_addr(addr, true);
+            ACE_CString s_addr(addr);
+            hp->add_endpoint(s_addr);
+          }
+        break;
       }
     case 12: // opened as TAO_SERVER_ROLE
       {
-	thr->pending_peer (new PeerProcess(line,offset,false,"",0));
-	break;
+        thr->pending_peer (new PeerProcess(line,offset,false,"",0));
+        break;
       }
     default: // future expansion
       {
diff --git a/TAO/utils/logWalker/PeerProcess.cpp b/TAO/utils/logWalker/PeerProcess.cpp
index b02abd2f637..6cae6ed0e2e 100644
--- a/TAO/utils/logWalker/PeerProcess.cpp
+++ b/TAO/utils/logWalker/PeerProcess.cpp
@@ -88,7 +88,7 @@ PeerProcess::id (void) const
     {
       const ACE_CString &pname = this->remote_->proc_name();
       if (pname.length() > 0)
-	return pname.c_str();
+        return pname.c_str();
     }
 
   return this->ident_;
@@ -149,9 +149,9 @@ PeerProcess::find_invocation (size_t req_id)
     {
       i.next(inv);
       if (inv->request_id() == req_id)
-	{
-	  return inv;
-	}
+        {
+          return inv;
+        }
     }
   return 0;
 }
@@ -166,9 +166,9 @@ PeerProcess::find_invocation_size (size_t len)
     {
       i.next(inv);
       if (!inv->message_complete() && inv->expected_size() == len)
-	{
-	  return inv;
-	}
+        {
+          return inv;
+        }
     }
   return 0;
 }
@@ -192,7 +192,7 @@ PeerProcess::dump_summary (ostream &strm)
        << this->handle_ << "] as ";
   if (this->client_)
       strm << "client on " 
-	   << this->local_addr_;
+           << this->local_addr_;
   else
     strm << " server";
   if (this->remote_)
diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp
index 05f685f3727..894f78fabc4 100644
--- a/TAO/utils/logWalker/Thread.cpp
+++ b/TAO/utils/logWalker/Thread.cpp
@@ -52,7 +52,7 @@ Thread::exit_wait (PeerProcess *pp, size_t linenum)
     {
       ACE_ERROR ((LM_ERROR, 
                   "Line %d, Ending an invocation to peer %s, but most recent started"
-		  " is to peer %s\n", linenum, pp->id(), old->id()));
+                  " is to peer %s\n", linenum, pp->id(), old->id()));
       //      this->pending_.push(old);
   if (this->pending_.pop(old) == -1)
     return;
@@ -114,7 +114,7 @@ Thread::dump_detail (ostream &strm)
        << "\t" << this->encounters_ << " encounters";
   if (nested_ > 0)
     strm <<", with " << this->nested_ << " nested upcalls, max depth " 
-	 << this->max_depth_;
+         << this->max_depth_;
   strm << endl; 
 }
 
diff --git a/TAO/utils/logWalker/logWalker.cpp b/TAO/utils/logWalker/logWalker.cpp
index 976d9c721c7..af8b2b104c9 100644
--- a/TAO/utils/logWalker/logWalker.cpp
+++ b/TAO/utils/logWalker/logWalker.cpp
@@ -39,40 +39,40 @@ parse_manifest (Session &session, ACE_TCHAR *filename)
     {
       strm.getline(buffer,500);
       if (buffer[0] == '\0' || 
-	  buffer[0] == '#')
-	{
-	  continue;
-	}
+          buffer[0] == '#')
+        {
+          continue;
+        }
       if (buffer[0] == '-')
-	{
-	  if (buffer[1] == 'o')
-	    {
-	      outfile = new char[ACE_OS::strlen(buffer) - 3];
-	      ACE_OS::strcpy(buffer+3,outfile);
-	      continue;
-	    }
-	  if (buffer[1] == 't')
-	    {
-	      Session::set_tao_version (buffer+3);
-	      continue;
-	    }
-	  if (buffer[1] == 'a')
-	    {
-	      session.alternate_address(buffer+3);
-	      continue;
-	    }
-	  if (buffer[1] == 'p')
-	    {
-	      session.default_service (buffer+3);
-	      continue;
-	    }
-	}
+        {
+          if (buffer[1] == 'o')
+            {
+              outfile = new char[ACE_OS::strlen(buffer) - 3];
+              ACE_OS::strcpy(buffer+3,outfile);
+              continue;
+            }
+          if (buffer[1] == 't')
+            {
+              Session::set_tao_version (buffer+3);
+              continue;
+            }
+          if (buffer[1] == 'a')
+            {
+              session.alternate_address(buffer+3);
+              continue;
+            }
+          if (buffer[1] == 'p')
+            {
+              session.default_service (buffer+3);
+              continue;
+            }
+        }
       if (ACE_OS::strchr(buffer,'=') == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG,"Unparsable string: %s\n",
-		      buffer));
-	  return;
-	}
+        {
+          ACE_DEBUG ((LM_DEBUG,"Unparsable string: %s\n",
+                      buffer));
+          return;
+        }
       ACE_Tokenizer tokens(buffer);
       tokens.delimiter_replace('=',0);
       char *alias = tokens.next();
@@ -106,18 +106,18 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
       if (ACE_OS::strcasecmp (argv[i], "-t") == 0)
         {
           Session::set_tao_version (argv[++i]);
-	  continue;
+          continue;
         }
       if (ACE_OS::strcasecmp (argv[i], "-a") == 0)
-	{
-	  session.alternate_address (argv[++i]);
-	  continue;
-	}
+        {
+          session.alternate_address (argv[++i]);
+          continue;
+        }
       if (ACE_OS::strcasecmp (argv[i], "-p") == 0)
-	{
-	  session.default_service (argv[++i]);
-	  continue;
-	}
+        {
+          session.default_service (argv[++i]);
+          continue;
+        }
 
       Log log(session);
       ACE_DEBUG ((LM_DEBUG,"Parsing file %s\n", argv[i]));
diff --git a/TAO/utils/logWalker/logWalker.mpc b/TAO/utils/logWalker/logWalker.mpc
index aea3fd29078..ec932b607b6 100644
--- a/TAO/utils/logWalker/logWalker.mpc
+++ b/TAO/utils/logWalker/logWalker.mpc
@@ -1,4 +1,5 @@
 // -*- mpc -*-
+// $Id$
 
 project : aceexe {
   exename = tao_logWalker