Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-29 08:37:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed folderIterator::d_name() because it duplicates file_name()

Browse source
This commit is contained in:
csoler 2016-10-09 21:03:01 +02:00
parent 32816eda71
commit 957d48b5fc
5 changed files with 4 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libretroshare/src/util/folderiterator.cc
View file

@ -63,7 +63,7 @@ void FolderIterator::next()
{
while(readdir())
{
d_name(mFileName);
mFileName = ent->d_name ;
if(mFileName == "." || mFileName == "..")
continue ;
@ -145,25 +145,6 @@ bool FolderIterator::readdir()
#endif
}
bool FolderIterator::d_name(std::string& dest)
{
if(!validity)
return false;
#ifdef WINDOWS_SYS
if(! ConvertUtf16ToUtf8(fileInfo.cFileName, dest)) {
validity = false;
return false;
}
#else
if(ent == 0)
return false;
dest = ent->d_name;
#endif
return true;
}
time_t FolderIterator::dir_modtime() const { return mFolderModTime ; }
const std::string& FolderIterator::file_fullpath() { return mFullPath ; }

2
libretroshare/src/util/folderiterator.h
View file

@ -39,8 +39,6 @@ public:
bool readdir();
void next();
#warning this one should go, as it reports the same information than file_name()
bool d_name(std::string& dest);
bool closedir();
const std::string& file_name() ;