lee/gsmartcontrol
1
0
Fork 0
mirror of https://github.com/ashaduri/gsmartcontrol.git synced 2026-10-01 16:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few clang-tidy warnings in applib.

Browse Source
This commit is contained in:
Alexander Shaduri
2021-03-03 16:53:22 +04:00
parent e329946213
commit ff3b07a086
15 changed files with 142 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/applib/storage_device.cpp
+9 -5
View File
@@ -368,14 +368,16 @@ A mandatory SMART command failed: exiting. To continue, add one or more '-T perm
std::string output;
std::string error_msg = execute_device_smartctl((b ? "--smart=on --saveauto=on" : "--smart=off"), smartctl_ex, output);
if (!error_msg.empty())
if (!error_msg.empty()) {
return error_msg;
}
// search at line start, because they are sometimes present in other sentences too.
if (app_pcre_match("/^SMART Enabled/mi", output) || app_pcre_match("/^SMART Disabled/mi", output)) {
return std::string(); // success
}
} else if (app_pcre_match("/^A mandatory SMART command failed/mi", output)) {
if (app_pcre_match("/^A mandatory SMART command failed/mi", output)) {
return _("Mandatory SMART command failed.");
}
@@ -386,8 +388,9 @@ A mandatory SMART command failed: exiting. To continue, add one or more '-T perm
std::string StorageDevice::set_aodc_enabled(bool b, const std::shared_ptr<CmdexSync>& smartctl_ex)
{
if (this->test_is_active_)
if (this->test_is_active_) {
return _("A test is currently being performed on this drive.");
}
// execute smartctl --offlineauto=on|off /dev/...
// Output:
@@ -407,8 +410,9 @@ A mandatory SMART command failed: exiting. To continue, add one or more '-T perm
if (app_pcre_match("/Testing Enabled/mi", output) || app_pcre_match("/Testing Disabled/mi", output)) {
return std::string(); // success
}
} else if (app_pcre_match("/^A mandatory SMART command failed/mi", output)) {
if (app_pcre_match("/^A mandatory SMART command failed/mi", output)) {
return _("Mandatory SMART command failed.");
}
@@ -692,7 +696,7 @@ std::string StorageDevice::get_serial_number() const
bool StorageDevice::get_is_hdd() const
{
return hdd_.has_value() ? hdd_.value() : false;
return hdd_.has_value() && hdd_.value();
}