code cleanup
This commit is contained in:
parent
25d8ca6920
commit
af38d60982
|
@ -322,30 +322,13 @@ void reHDD::searchDrives(list <Drive>* plistDrives)
|
|||
*/
|
||||
void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
|
||||
{
|
||||
//string sDelimiter = ":";
|
||||
// string sIgnoredDrivePath;
|
||||
string sIgnoredDriveUUID;
|
||||
|
||||
list<tuple<string>> vtlIgnoredDevices; //store drives from ingnore file
|
||||
|
||||
ifstream input( "ignoreDrives.conf" ); //read ingnore file
|
||||
|
||||
for(string sLine; getline( input, sLine );)
|
||||
{
|
||||
// if (string(sLine).find("/dev/sd") != string::npos)
|
||||
// {
|
||||
//size_t pos = 0;
|
||||
//string token;
|
||||
// while ((pos = sLine.find(sDelimiter)) != string::npos)
|
||||
// {
|
||||
//token = sLine.substr(0, pos);
|
||||
//sIgnoredDrivePath = token;
|
||||
//sLine.erase(0, pos + sDelimiter.length());
|
||||
sIgnoredDriveUUID = sLine;
|
||||
// } //end while
|
||||
Logger::logThis()->info("read uuid: " + sIgnoredDriveUUID);
|
||||
vtlIgnoredDevices.emplace_back(sIgnoredDriveUUID); //add found path and uuid from ignore file to vector
|
||||
// }
|
||||
Logger::logThis()->info("read uuid: " + sLine);
|
||||
vtlIgnoredDevices.emplace_back(sLine); //add found path and uuid from ignore file to vector
|
||||
}
|
||||
//loop through found entries in ingnore file
|
||||
for(auto row : vtlIgnoredDevices)
|
||||
|
@ -354,8 +337,6 @@ void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
|
|||
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
|
||||
{
|
||||
string sUUID;
|
||||
//if (!get<0>(row).compare(it->getPath())) //find same drive based on path
|
||||
// {
|
||||
char * cLine = NULL;
|
||||
size_t len = 0;
|
||||
string sCMD = "blkid ";
|
||||
|
@ -381,13 +362,7 @@ void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
|
|||
pclose(outputfileBlkid);
|
||||
//cout << "blkid uuid:" << sUUID << endl;
|
||||
|
||||
if (get<0>(row).compare(sUUID)) //compare uuid from ignore file and uuid from drive
|
||||
{
|
||||
//cout << "[ERROR] different uuid found than in ignore file:" << it->getPath() << endl;
|
||||
//Logger::logThis()->error("different uuid found than in ignore file: " + it->getPath() + " uuid from drive: " + sUUID);
|
||||
//exit(EXIT_FAILURE); // exit to prevent accidentally shred a system drive
|
||||
}
|
||||
else
|
||||
if (!get<0>(row).compare(sUUID)) //compare uuid from ignore file and uuid from drive
|
||||
{
|
||||
// same uuid found than in ignore file --> ignore this drive
|
||||
#ifdef LOG_LEVEL_HIGH
|
||||
|
@ -396,7 +371,6 @@ void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
|
|||
it = plistDrives->erase(it);
|
||||
it--;
|
||||
}
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue