localhorst/reHDD
1
0
Fork 1
Code Issues 6 Pull Requests 2 Releases 10 Wiki Activity

bugfix/ai-static-analysis #82

Open
localhorst wants to merge 15 commits from bugfix/ai-static-analysis into master
pull from: bugfix/ai-static-analysis
merge into: localhorst:master
Conversation 2 Commits 15 Files Changed 5 +134 -115
5 changed files with 134 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4afc155230 - Show all commits

8
src/shred.cpp
View File

@ -60,7 +60,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE); randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE);
if (randomSrcFileDiscr == -1) if (randomSrcFileDiscr == -1)
{ {
std::string errorMsg(strerror(randomSrcFileDiscr)); std::string errorMsg(strerror(errno));
Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial()); Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
perror(randomsrc); perror(randomsrc);
cleanup(); cleanup();
@ -71,7 +71,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE); driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE);
if (driveFileDiscr == -1) if (driveFileDiscr == -1)
{ {
std::string errorMsg(strerror(driveFileDiscr)); std::string errorMsg(strerror(errno));
Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial()); Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
perror(cpDrivePath); perror(cpDrivePath);
cleanup(); cleanup();
@ -82,7 +82,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
ssize_t readRet = read(randomSrcFileDiscr, ucKey, sizeof(ucKey)); ssize_t readRet = read(randomSrcFileDiscr, ucKey, sizeof(ucKey));
if (readRet <= 0) if (readRet <= 0)
{ {
std::string errorMsg(strerror(readRet)); std::string errorMsg(strerror(errno));
Logger::logThis()->error("Shred-Task: Read random key failed! " + errorMsg + " - Drive: " + drive->getSerial()); Logger::logThis()->error("Shred-Task: Read random key failed! " + errorMsg + " - Drive: " + drive->getSerial());
perror(randomsrc); perror(randomsrc);
cleanup(); cleanup();
@ -132,7 +132,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
if (iByteShredded <= 0) if (iByteShredded <= 0)
{ {
std::string errorMsg(strerror(iByteShredded)); std::string errorMsg(strerror(errno));
Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial()); Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
perror("unable to write random data"); perror("unable to write random data");
cleanup(); cleanup();