[devel] [PATCH 1/1] smf: Fix c-linkage and string op errors V2 [#3065]

[Thanh Nguyen]

- Fix faults in C linkage in file
  src/smf/smfd/SmfUtils.h.
- Fix fault in string concatenation in file
  src/smf/smfd/SmfUpgradeCampaign.cc
---
 src/smf/smfd/SmfUpgradeCampaign.cc |  3 ++-
 src/smf/smfd/SmfUtils.h            | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/smf/smfd/SmfUpgradeCampaign.cc 
b/src/smf/smfd/SmfUpgradeCampaign.cc
index 3c50bf7..4a1591a 100644
--- a/src/smf/smfd/SmfUpgradeCampaign.cc
+++ b/src/smf/smfd/SmfUpgradeCampaign.cc
@@ -930,7 +930,8 @@ void SmfUpgradeCampaign::continueExec() {
     if (o_result == true) {
       LOG_NO("The campaign have been restarted to many times");
       int cnt = smfd_cb->smfCampMaxRestart;
-      std::string error = "To many campaign restarts, max " + cnt;
+      std::string error = "To many campaign restarts, max "
+          + std::to_string(cnt);
       SmfCampaignThread::instance()->campaign()->setError(error);
       changeState(SmfCampStateExecFailed::instance());
       TRACE_LEAVE();
diff --git a/src/smf/smfd/SmfUtils.h b/src/smf/smfd/SmfUtils.h
index 894e3c9..5e47696 100644
--- a/src/smf/smfd/SmfUtils.h
+++ b/src/smf/smfd/SmfUtils.h
@@ -42,6 +42,12 @@
 class SmfImmOperation;
 class SmfRollbackCcb;
 
+extern std::string smf_valueToString(SaImmAttrValueT value,
+                                     SaImmValueTypeT type);
+extern const std::string smfStateToString(const uint32_t& i_stateId,
+                                          const uint32_t& i_state);
+
+
 /* ========================================================================
  *   TYPE DEFINITIONS
  * ========================================================================
@@ -62,15 +68,11 @@ extern bool smf_stringsToValues(SaImmAttrValuesT_2* 
i_attribute,
                                 std::list<std::string>& i_values);
 extern bool smf_stringToValue(SaImmValueTypeT i_type, SaImmAttrValueT* i_value,
                               const char* i_str);
-extern std::string smf_valueToString(SaImmAttrValueT value,
-                                     SaImmValueTypeT type);
 extern int smf_opStringToInt(const char* i_str);
 extern int smf_system(std::string i_cmd);
 extern void updateSaflog(const std::string& i_dn, const uint32_t& i_stateId,
                          const uint32_t& i_newState,
                          const uint32_t& i_oldState);
-extern const std::string smfStateToString(const uint32_t& i_stateId,
-                                          const uint32_t& i_state);
 extern bool compare_du_part(unitNameAndState& first, unitNameAndState& second);
 extern bool unique_du_part(unitNameAndState& first, unitNameAndState& second);
 
-- 
2.7.4



_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel