Return code cleanup
Moved attention handler return codes to hpp file and removed their
usage in the analyzer code since technically the analyzer is a
seperate library.
Signed-off-by: Ben Tyner <ben.tyner@ibm.com>
Change-Id: I57eb66330bf0db40edb6e2b1994c1c7e062c1744
diff --git a/attn/attn_handler.cpp b/attn/attn_handler.cpp
index 341fe2b..945156d 100644
--- a/attn/attn_handler.cpp
+++ b/attn/attn_handler.cpp
@@ -1,6 +1,7 @@
#include <analyzer/analyzer_main.hpp>
#include <attention.hpp>
#include <attn_config.hpp>
+#include <attn_handler.hpp>
#include <attn_logging.hpp>
#include <bp_handler.hpp>
#include <ti_handler.hpp>
@@ -14,15 +15,6 @@
namespace attn
{
-/** @brief Return codes */
-enum ReturnCodes
-{
- RC_SUCCESS = 0,
- RC_NOT_HANDLED,
- RC_ANALYZER_ERROR,
- RC_CFAM_ERROR
-};
-
/**
* @brief Handle SBE vital attention
*
@@ -226,9 +218,8 @@
// errors that were isolated
std::map<std::string, std::string> errors;
- rc = analyzer::analyzeHardware(errors); // analyze hardware
-
- if (RC_SUCCESS != rc)
+ // analyze errors
+ if (true != analyzer::analyzeHardware(errors))
{
rc = RC_ANALYZER_ERROR;
}
diff --git a/attn/attn_handler.hpp b/attn/attn_handler.hpp
index f81a9e7..1500d39 100644
--- a/attn/attn_handler.hpp
+++ b/attn/attn_handler.hpp
@@ -5,6 +5,15 @@
namespace attn
{
+/** @brief Attention handler return codes */
+enum ReturnCodes
+{
+ RC_SUCCESS = 0,
+ RC_NOT_HANDLED,
+ RC_ANALYZER_ERROR,
+ RC_CFAM_ERROR
+};
+
/**
* @brief The main attention handler logic
*