Fix used int type to uint32_t

Variables type is changed

6 files changed, 23 insertions, 25 deletions

diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index 9d8c225362..ea69b9fb7e 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -579,7 +579,7 @@ class PolicyHandler : public PolicyHandlerInterface,
    * and is related to a registered application or these are default URLs,
    * otherwise FALSE
    */
-  bool IsUrlAppIdValid(const int app_idx, const EndpointUrls& urls) const;
+  bool IsUrlAppIdValid(const uint32_t app_idx, const EndpointUrls& urls) const;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyHandler);
 };
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index 29c38fb213..5dce762bf7 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -1799,7 +1799,7 @@ void PolicyHandler::Add(const std::string& app_id,
   policy_manager_->Add(app_id, type, timespan_seconds);
 }
 
-bool PolicyHandler::IsUrlAppIdValid(const int app_idx,
+bool PolicyHandler::IsUrlAppIdValid(const uint32_t app_idx,
                                     const EndpointUrls& urls) const {
   const EndpointData& app_data = urls[app_idx];
   const std::vector<std::string> app_urls = app_data.url;
diff --git a/src/components/include/policy/policy_regular/policy/policy_types.h b/src/components/include/policy/policy_regular/policy/policy_types.h
index 4e482b0e20..dbd910d62d 100644
--- a/src/components/include/policy/policy_regular/policy/policy_types.h
+++ b/src/components/include/policy/policy_regular/policy/policy_types.h
@@ -319,19 +319,19 @@ struct MetaInfo {
  * that will be sent on the next OnSystemRequest retry sequence
  */
 struct RetrySequenceURL {
-  int app_idx_;
-  int url_idx_;
+  uint32_t app_idx_;
+  uint32_t url_idx_;
   std::string policy_app_id_;
-  RetrySequenceURL(int app, int url, const std::string& app_id)
+  RetrySequenceURL(uint32_t app, uint32_t url, const std::string& app_id)
       : app_idx_(app), url_idx_(url), policy_app_id_(app_id) {}
-  RetrySequenceURL() {
-    app_idx_ = 0;
-    url_idx_ = 0;
-    policy_app_id_ = "";
-  }
+  RetrySequenceURL() : app_idx_(0), url_idx_(0) {}
 };
 
-typedef std::pair<int, int> AppIdURL;
+/**
+ * @brief Index of the application, index of its URL
+ * from the Endpoints vector
+ */
+typedef std::pair<uint32_t, uint32_t> AppIdURL;
 
 }  //  namespace policy
 
diff --git a/src/components/policy/policy_external/include/policy/policy_types.h b/src/components/policy/policy_external/include/policy/policy_types.h
index 021e837196..a0eefda555 100644
--- a/src/components/policy/policy_external/include/policy/policy_types.h
+++ b/src/components/policy/policy_external/include/policy/policy_types.h
@@ -370,19 +370,19 @@ struct MetaInfo {
  * that will be sent on the next OnSystemRequest retry sequence
  */
 struct RetrySequenceURL {
-  int app_idx_;
-  int url_idx_;
+  uint32_t app_idx_;
+  uint32_t url_idx_;
   std::string policy_app_id_;
-  RetrySequenceURL(int app, int url, const std::string& app_id)
+  RetrySequenceURL(uint32_t app, uint32_t url, const std::string& app_id)
       : app_idx_(app), url_idx_(url), policy_app_id_(app_id) {}
-  RetrySequenceURL() {
-    app_idx_ = 0;
-    url_idx_ = 0;
-    policy_app_id_ = "";
-  }
-}
+  RetrySequenceURL() : app_idx_(0), url_idx_(0) {}
+};
 
-typedef std::pair<int, int> AppIdURL;
+/**
+ * @brief Index of the application, index of its URL
+ * from the Endpoints vector
+ */
+typedef std::pair<uint32_t, uint32_t> AppIdURL;
 
 }  //  namespace policy
 
diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc
index d66730ff4f..1db21bf7d2 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -1227,9 +1227,8 @@ AppIdURL PolicyManagerImpl::RetrySequenceUrl(const struct RetrySequenceURL& rs,
       app_idx = 0;
     }
   }
-  const AppIdURL next_app_url = std::make_pair(app_idx, url_idx);
 
-  return next_app_url;
+  return std::make_pair(app_idx, url_idx);
 }
 
 /**
diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc
index 0f523add7e..19755e3f15 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -935,9 +935,8 @@ AppIdURL PolicyManagerImpl::RetrySequenceUrl(const struct RetrySequenceURL& rs,
       app_idx = 0;
     }
   }
-  const AppIdURL next_app_url = std::make_pair(app_idx, url_idx);
 
-  return next_app_url;
+  return std::make_pair(app_idx, url_idx);
 }
 
 class CallStatusChange : public utils::Callable {