fix typo from clear_session to clean_session

diff --git a/common/AittOption.cc b/common/AittOption.cc
index 87a8896..ab23677 100644 (file)
--- a/common/AittOption.cc
+++ b/common/AittOption.cc
@@ -17,23 +17,23 @@
 
 #include "aitt_internal.h"
 
-AittOption::AittOption() : clear_session_(false), use_custom_broker(false)
+AittOption::AittOption() : clean_session_(false), use_custom_broker(false)
 {
 }
 
-AittOption::AittOption(bool clear_session, bool use_custom_mqtt_broker)
-      : clear_session_(clear_session), use_custom_broker(use_custom_mqtt_broker)
+AittOption::AittOption(bool clean_session, bool use_custom_mqtt_broker)
+      : clean_session_(clean_session), use_custom_broker(use_custom_mqtt_broker)
 {
 }
 
-void AittOption::SetClearSession(bool val)
+void AittOption::SetCleanSession(bool val)
 {
-    clear_session_ = val;
+    clean_session_ = val;
 }
 
-bool AittOption::GetClearSession() const
+bool AittOption::GetCleanSession() const
 {
-    return clear_session_;
+    return clean_session_;
 }
 
 void AittOption::SetUseCustomMqttBroker(bool val)

diff --git a/include/AittOption.h b/include/AittOption.h
index 1669511..a273d65 100644 (file)
--- a/include/AittOption.h
+++ b/include/AittOption.h
@@ -22,11 +22,11 @@
 class API AittOption {
   public:
     AittOption();
-    explicit AittOption(bool clear_session, bool use_custom_broker);
+    explicit AittOption(bool clean_session, bool use_custom_broker);
     ~AittOption() = default;
 
-    void SetClearSession(bool val);
-    bool GetClearSession() const;
+    void SetCleanSession(bool val);
+    bool GetCleanSession() const;
     void SetUseCustomMqttBroker(bool val);
     bool GetUseCustomMqttBroker() const;
     void SetServiceID(const std::string &id);
@@ -39,7 +39,7 @@ class API AittOption {
     const char *GetCustomRWFile() const;
 
   private:
-    bool clear_session_;
+    bool clean_session_;
     bool use_custom_broker;
     std::string service_id;
     std::string location_id;

diff --git a/src/AITTImpl.cc b/src/AITTImpl.cc
index e2bb3f2..4822e10 100644 (file)
--- a/src/AITTImpl.cc
+++ b/src/AITTImpl.cc
@@ -39,10 +39,10 @@ AITT::Impl::Impl(AITT &parent, const std::string &id, const std::string &my_ip,
     if (option.GetUseCustomMqttBroker()) {
         mq = modules.NewCustomMQ(id, option);
         AittOption discovery_option = option;
-        discovery_option.SetClearSession(false);
+        discovery_option.SetCleanSession(false);
         discovery.SetMQ(modules.NewCustomMQ(id + 'd', option));
     } else {
-        mq = std::unique_ptr<MQ>(new MosquittoMQ(id, option.GetClearSession()));
+        mq = std::unique_ptr<MQ>(new MosquittoMQ(id, option.GetCleanSession()));
         discovery.SetMQ(std::unique_ptr<MQ>(new MosquittoMQ(id + 'd', false)));
     }
     aittThread = std::thread(&AITT::Impl::ThreadMain, this);

diff --git a/src/MosquittoMQ.cc b/src/MosquittoMQ.cc
index 57c6daa..431774e 100644 (file)
--- a/src/MosquittoMQ.cc
+++ b/src/MosquittoMQ.cc
@@ -33,7 +33,7 @@ namespace aitt {
 const std::string MosquittoMQ::REPLY_SEQUENCE_NUM_KEY = "sequenceNum";
 const std::string MosquittoMQ::REPLY_IS_END_SEQUENCE_KEY = "isEndSequence";
 
-MosquittoMQ::MosquittoMQ(const std::string &id, bool clear_session)
+MosquittoMQ::MosquittoMQ(const std::string &id, bool clean_session)
       : handle(nullptr),
         keep_alive(60),
         subscribers_iterating(false),
@@ -47,9 +47,9 @@ MosquittoMQ::MosquittoMQ(const std::string &id, bool clear_session)
             break;
         }
 
-        handle = mosquitto_new(id.c_str(), clear_session, this);
+        handle = mosquitto_new(id.c_str(), clean_session, this);
         if (handle == nullptr) {
-            ERR("mosquitto_new(%s, %d) Fail", id.c_str(), clear_session);
+            ERR("mosquitto_new(%s, %d) Fail", id.c_str(), clean_session);
             break;
         }
 

diff --git a/src/MosquittoMQ.h b/src/MosquittoMQ.h
index 38c6e48..33fd1bf 100644 (file)
--- a/src/MosquittoMQ.h
+++ b/src/MosquittoMQ.h
@@ -32,7 +32,7 @@ namespace aitt {
 
 class MosquittoMQ : public MQ {
   public:
-    explicit MosquittoMQ(const std::string &id, bool clear_session = false);
+    explicit MosquittoMQ(const std::string &id, bool clean_session = false);
     virtual ~MosquittoMQ(void);
 
     void SetConnectionCallback(const MQConnectionCallback &cb);

diff --git a/src/aitt_c.cc b/src/aitt_c.cc
index e290693..3bdcfc8 100644 (file)
--- a/src/aitt_c.cc
+++ b/src/aitt_c.cc
@@ -126,7 +126,7 @@ API int aitt_option_set(aitt_option_h handle, aitt_option_e option, const char *
     case AITT_OPT_CLEAN_SESSION:
         ret = _to_boolean(value, bool_val);
         if (ret == AITT_ERROR_NONE)
-            handle->option.SetClearSession(bool_val);
+            handle->option.SetCleanSession(bool_val);
         return ret;
     case AITT_OPT_CUSTOM_BROKER:
         ret = _to_boolean(value, bool_val);
@@ -149,7 +149,7 @@ API const char *aitt_option_get(aitt_option_h handle, aitt_option_e option)
     case AITT_OPT_MY_IP:
         return handle->my_ip;
     case AITT_OPT_CLEAN_SESSION:
-        return (handle->option.GetClearSession()) ? "true" : "false";
+        return (handle->option.GetCleanSession()) ? "true" : "false";
     case AITT_OPT_CUSTOM_BROKER:
         return (handle->option.GetUseCustomMqttBroker()) ? "true" : "false";
     default: