Move code

uweseimet · Jan 26, 2024 · fd6abd1 · fd6abd1
1 parent 021e886
commit fd6abd1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/cpp/initiator/initiator_util.cpp b/cpp/initiator/initiator_util.cpp
@@ -20,7 +20,7 @@ string initiator_util::GetSenseData(InitiatorExecutor &executor, bool sasi)
     array < uint8_t, 6 > cdb = { };
     cdb[4] = static_cast<uint8_t>(buf.size());
 
-    if (!executor.Execute(scsi_command::cmd_request_sense, cdb, buf, static_cast<int>(buf.size()), sasi)) {
+    if (executor.Execute(scsi_command::cmd_request_sense, cdb, buf, static_cast<int>(buf.size()), sasi)) {
         return "Can't execute REQUEST SENSE";
     }
 
@@ -32,6 +32,17 @@ string initiator_util::GetSenseData(InitiatorExecutor &executor, bool sasi)
         buf[13]);
 }
 
+void initiator_util::LogStatus(int status)
+{
+    if (const auto &it_status = STATUS_MAPPING.find(static_cast<scsi_defs::status>(status)); it_status
+        != STATUS_MAPPING.end()) {
+        warn("Device reported status {0} (status code ${1:02x})", it_status->second, status);
+    }
+    else {
+        warn("Device reported status code ${0:02x}", status);
+    }
+}
+
 bool initiator_util::SetLogLevel(const string &log_level)
 {
     const level::level_enum l = level::from_str(log_level);

diff --git a/cpp/initiator/initiator_util.h b/cpp/initiator/initiator_util.h
@@ -15,5 +15,6 @@ using namespace std;
 namespace initiator_util
 {
 string GetSenseData(InitiatorExecutor&, bool);
+void LogStatus(int);
 bool SetLogLevel(const string&);
 }
diff --git a/cpp/s2pexec/s2pexec_executor.cpp b/cpp/s2pexec/s2pexec_executor.cpp
@@ -6,23 +6,17 @@
 //
 //---------------------------------------------------------------------------
 
-#include <spdlog/spdlog.h>
+#include "initiator/initiator_util.h"
 #include "s2pexec_executor.h"
 
 using namespace std;
-using namespace spdlog;
+using namespace initiator_util;
 
 int S2pExecExecutor::ExecuteCommand(scsi_command cmd, vector<uint8_t> &cdb, vector<uint8_t> &buffer, bool sasi)
 {
     const int status = initiator_executor->Execute(cmd, cdb, buffer, buffer.size(), sasi);
 
-    if (const auto &it_status = STATUS_MAPPING.find(static_cast<scsi_defs::status>(status)); it_status
-        != STATUS_MAPPING.end()) {
-        warn("Device reported status {0} (status code ${1:02x})", it_status->second, status);
-    }
-    else {
-        warn("Device reported status code ${0:02x}", status);
-    }
+    LogStatus(status);
 
     return status;
 }