[Zoolib-checkins] CVS: zoolib/src/platform/posix ZFile_POSIX.cpp,1.7,1.8

[Andrew G. <ag...@us...>]

Update of /cvsroot/zoolib/zoolib/src/platform/posix
In directory usw-pr-cvs1:/tmp/cvs-serv4561

Modified Files:
	ZFile_POSIX.cpp 
Log Message:
Call ZFileTrail::sTrailFromTo rather than using local method.


Index: ZFile_POSIX.cpp
===================================================================
RCS file: /cvsroot/zoolib/zoolib/src/platform/posix/ZFile_POSIX.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ZFile_POSIX.cpp	19 Apr 2002 12:41:08 -0000	1.7
--- ZFile_POSIX.cpp	22 Apr 2002 17:58:06 -0000	1.8
***************
*** 382,401 ****
  	}
  
- static ZFileTrail sTrailFromTo(const vector<string>& iSource, const vector<string>& iDest)
- 	{
- 	size_t matchUntil = 0;
- 	while (matchUntil < iSource.size() && matchUntil < iDest.size() && iSource[matchUntil] == iDest[matchUntil])
- 		++matchUntil;
- 
- 	ZFileTrail theTrail;
- 	if (matchUntil < iSource.size())
- 		theTrail.AppendBounces(iSource.size() - matchUntil);
- 
- 	if (matchUntil < iDest.size())
- 		theTrail.AppendTrail(iDest.begin() + matchUntil, iDest.size() - matchUntil);
- 
- 	return theTrail;
- 	}
- 
  ZFileTrail ZFileLoc_POSIX::TrailTo(ZRef<ZFileLoc> iDest, ZFile::Error* oErr) const
  	{
--- 382,385 ----
***************
*** 406,410 ****
  		{
  		if (fIsAtRoot == dest->fIsAtRoot)
! 			return sTrailFromTo(fComps, dest->fComps);
  
  		vector<string> theFullTrail;
--- 390,394 ----
  		{
  		if (fIsAtRoot == dest->fIsAtRoot)
! 			return ZFileTrail::sTrailFromTo(fComps, dest->fComps);
  
  		vector<string> theFullTrail;
***************
*** 413,421 ****
  			{
  			theFullTrail.insert(theFullTrail.end(), dest->fComps.begin(), dest->fComps.end());
! 			return sTrailFromTo(fComps, theFullTrail);
  			}
  
  		theFullTrail.insert(theFullTrail.end(), fComps.begin(), fComps.end());
! 		return sTrailFromTo(theFullTrail, dest->fComps);
  		}
  
--- 397,405 ----
  			{
  			theFullTrail.insert(theFullTrail.end(), dest->fComps.begin(), dest->fComps.end());
! 			return ZFileTrail::sTrailFromTo(fComps, theFullTrail);
  			}
  
  		theFullTrail.insert(theFullTrail.end(), fComps.begin(), fComps.end());
! 		return ZFileTrail::sTrailFromTo(theFullTrail, dest->fComps);
  		}