[Once-cvs] oncecode/src/client/content occlientcontentmgr.cpp,1.19,1.20 ocpartialfile.cpp,1.10,1.11

[Manuel A. F. M. <ma...@us...>]

Update of /cvsroot/once/oncecode/src/client/content
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11333/src/client/content

Modified Files:
	occlientcontentmgr.cpp ocpartialfile.cpp 
Log Message:
Changes to work with new CS, and a few minor changes here and there not important to comment

Index: ocpartialfile.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/client/content/ocpartialfile.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ocpartialfile.cpp	5 Dec 2005 15:50:03 -0000	1.10
--- ocpartialfile.cpp	26 Dec 2005 11:48:34 -0000	1.11
***************
*** 96,100 ****
  	OC_PERM_ASSERT(nbr_parts == current);
  
! 	csRef<iVFS> vfs = Client->GetVFS();
  	csRef<iFile> file = vfs->Open(filename.c_str(), VFS_FILE_WRITE);
  
--- 96,100 ----
  	OC_PERM_ASSERT(nbr_parts == current);
  
! 	iVFS* vfs = Client->GetVFS();
  	csRef<iFile> file = vfs->Open(filename.c_str(), VFS_FILE_WRITE);
  

Index: occlientcontentmgr.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/client/content/occlientcontentmgr.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** occlientcontentmgr.cpp	9 Dec 2005 16:42:40 -0000	1.19
--- occlientcontentmgr.cpp	26 Dec 2005 11:48:34 -0000	1.20
***************
*** 54,59 ****
  ocClientContentMgr::~ocClientContentMgr()
  {
- 	vfs->DecRef();
- 
  	csHash<ocPartialContentFile*>::GlobalIterator it =
  		update_files.GetIterator();
--- 54,57 ----
***************
*** 108,111 ****
--- 106,111 ----
  		string fileName = delete_list[i].c_str();
  
+ 		// using the filter to reject names not in
+ 		// /once/content
  		if (!PassFilenameFilter(fileName.c_str()))
  			continue;