Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed warning when friend directory list cannot be found

Browse source
This commit is contained in:
csoler 2016-10-12 23:31:32 +02:00
parent bd9a464d11
commit 10c269ec5a
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/file_sharing/dir_hierarchy.cc
View file

@ -1144,7 +1144,9 @@ bool InternalFileHierarchyStorage::load(const std::string& fname)
}
catch(read_error& e)
{
#ifdef DEBUG_DIRECTORY_STORAGE
std::cerr << "Error while reading: " << e.what() << std::endl;
#endif
if(buffer != NULL)
free(buffer) ;

4
libretroshare/src/file_sharing/directory_storage.cc
View file

@ -174,10 +174,10 @@ int DirectoryStorage::searchHash(const RsFileHash& hash, std::list<EntryIndex> &
return mFileHierarchy->searchHash(hash,results);
}
void DirectoryStorage::load(const std::string& local_file_name)
bool DirectoryStorage::load(const std::string& local_file_name)
{
RS_STACK_MUTEX(mDirStorageMtx) ;
mFileHierarchy->load(local_file_name);
return mFileHierarchy->load(local_file_name);
}
void DirectoryStorage::save(const std::string& local_file_name)
{

2
libretroshare/src/file_sharing/directory_storage.h
View file

@ -152,7 +152,7 @@ class DirectoryStorage
void cleanup();
protected:
void load(const std::string& local_file_name) ;
bool load(const std::string& local_file_name) ;
void save(const std::string& local_file_name) ;
private:

2
libretroshare/src/file_sharing/filelist_io.cc
View file

@ -190,7 +190,9 @@ bool FileListIO::loadEncryptedDataFromFile(const std::string& fname,unsigned cha
if(!RsDirUtil::checkFile( fname,file_size,false ) )
{
#ifdef FIM_DEBUG
std::cerr << "Encrypted file " << fname << " not available." << std::endl;
#endif
return false;
}