summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacobkeeler <jacob.keeler@livioradio.com>2018-09-27 16:53:22 -0400
committerjacobkeeler <jacob.keeler@livioradio.com>2018-09-27 16:53:22 -0400
commitee367877d4126db27061827d1f4c8e0a9f07bc5b (patch)
tree78a26736b8c9d7e84ce2880af9bbb4dee7b38f34
parent461f76b129e998d4b60540491684c348dd5c27e2 (diff)
downloadsdl_core-ee367877d4126db27061827d1f4c8e0a9f07bc5b.tar.gz
Fix uninitialized field errors
CID 188297 CID 188291 Also fix request_type typo
-rw-r--r--src/components/application_manager/include/application_manager/request_info.h19
-rw-r--r--src/components/application_manager/src/request_controller.cc4
-rw-r--r--src/components/application_manager/src/request_info.cc4
-rw-r--r--src/components/application_manager/test/request_info_test.cc8
-rw-r--r--src/components/transport_manager/include/transport_manager/tcp/platform_specific/linux/platform_specific_network_interface_listener_impl.h7
5 files changed, 25 insertions, 17 deletions
diff --git a/src/components/application_manager/include/application_manager/request_info.h b/src/components/application_manager/include/application_manager/request_info.h
index 57b6986af0..da1bd0a2ee 100644
--- a/src/components/application_manager/include/application_manager/request_info.h
+++ b/src/components/application_manager/include/application_manager/request_info.h
@@ -60,7 +60,7 @@ struct RequestInfo {
RequestInfo()
: timeout_msec_(0)
, app_id_(0)
- , requst_type_(RequestNone)
+ , request_type_(RequestNone)
, correlation_id_(0) {
start_time_ = date_time::getCurrentTime();
updateEndTime();
@@ -68,16 +68,19 @@ struct RequestInfo {
virtual ~RequestInfo() {}
RequestInfo(RequestPtr request,
- const RequestType requst_type,
+ const RequestType request_type,
const uint64_t timeout_msec)
- : request_(request), timeout_msec_(timeout_msec), correlation_id_(0) {
+ : request_(request)
+ , timeout_msec_(timeout_msec)
+ , app_id_(0)
+ , correlation_id_(0) {
start_time_ = date_time::getCurrentTime();
updateEndTime();
- requst_type_ = requst_type;
+ request_type_ = request_type;
}
RequestInfo(RequestPtr request,
- const RequestType requst_type,
+ const RequestType request_type,
const date_time::TimeDuration& start_time,
const uint64_t timeout_msec);
@@ -111,8 +114,8 @@ struct RequestInfo {
return app_id_;
}
- RequestType requst_type() const {
- return requst_type_;
+ RequestType request_type() const {
+ return request_type_;
}
uint32_t requestId() {
@@ -132,7 +135,7 @@ struct RequestInfo {
uint64_t timeout_msec_;
date_time::TimeDuration end_time_;
uint32_t app_id_;
- RequestType requst_type_;
+ RequestType request_type_;
uint32_t correlation_id_;
};
diff --git a/src/components/application_manager/src/request_controller.cc b/src/components/application_manager/src/request_controller.cc
index 28c773ffcb..315cf6fdf8 100644
--- a/src/components/application_manager/src/request_controller.cc
+++ b/src/components/application_manager/src/request_controller.cc
@@ -401,7 +401,7 @@ void RequestController::TimeoutThread() {
LOG4CXX_DEBUG(logger_,
"Timeout for "
<< (RequestInfo::HMIRequest ==
- probably_expired->requst_type()
+ probably_expired->request_type()
? "HMI"
: "Mobile")
<< " request id: " << probably_expired->requestId()
@@ -420,7 +420,7 @@ void RequestController::TimeoutThread() {
LOG4CXX_INFO(logger_,
"Timeout for "
<< (RequestInfo::HMIRequest ==
- probably_expired->requst_type()
+ probably_expired->request_type()
? "HMI"
: "Mobile")
<< " request id: " << probably_expired->requestId()
diff --git a/src/components/application_manager/src/request_info.cc b/src/components/application_manager/src/request_info.cc
index 45e56c5f9e..cd99a42508 100644
--- a/src/components/application_manager/src/request_info.cc
+++ b/src/components/application_manager/src/request_info.cc
@@ -74,12 +74,12 @@ MobileRequestInfo::MobileRequestInfo(RequestPtr request,
}
RequestInfo::RequestInfo(RequestPtr request,
- const RequestInfo::RequestType requst_type,
+ const RequestInfo::RequestType request_type,
const date_time::TimeDuration& start_time,
const uint64_t timeout_msec)
: request_(request), start_time_(start_time), timeout_msec_(timeout_msec) {
updateEndTime();
- requst_type_ = requst_type;
+ request_type_ = request_type;
correlation_id_ = request_->correlation_id();
app_id_ = request_->connection_key();
}
diff --git a/src/components/application_manager/test/request_info_test.cc b/src/components/application_manager/test/request_info_test.cc
index 0d7e6c65ac..0abef44e9a 100644
--- a/src/components/application_manager/test/request_info_test.cc
+++ b/src/components/application_manager/test/request_info_test.cc
@@ -46,10 +46,10 @@ namespace application_manager_test {
class TestRequestInfo : public request_info::RequestInfo {
public:
TestRequestInfo(request_info::RequestPtr request,
- const RequestType requst_type,
+ const RequestType request_type,
const date_time::TimeDuration& start_time,
const uint64_t timeout_msec)
- : RequestInfo(request, requst_type, start_time, timeout_msec) {}
+ : RequestInfo(request, request_type, start_time, timeout_msec) {}
void SetEndTime(const date_time::TimeDuration& end_time) {
end_time_ = end_time;
}
@@ -77,14 +77,14 @@ class RequestInfoTest : public ::testing::Test {
std::shared_ptr<TestRequestInfo> CreateTestInfo(
uint32_t connection_key,
uint32_t correlation_id,
- request_info::RequestInfo::RequestType requst_type,
+ request_info::RequestInfo::RequestType request_type,
const date_time::TimeDuration& start_time,
uint64_t timeout_msec) {
std::shared_ptr<MockRequest> mock_request =
std::make_shared<MockRequest>(connection_key, correlation_id);
std::shared_ptr<TestRequestInfo> request =
std::make_shared<TestRequestInfo>(
- mock_request, requst_type, start_time, timeout_msec);
+ mock_request, request_type, start_time, timeout_msec);
return request;
}
};
diff --git a/src/components/transport_manager/include/transport_manager/tcp/platform_specific/linux/platform_specific_network_interface_listener_impl.h b/src/components/transport_manager/include/transport_manager/tcp/platform_specific/linux/platform_specific_network_interface_listener_impl.h
index a7338b94be..fd90cb0f22 100644
--- a/src/components/transport_manager/include/transport_manager/tcp/platform_specific/linux/platform_specific_network_interface_listener_impl.h
+++ b/src/components/transport_manager/include/transport_manager/tcp/platform_specific/linux/platform_specific_network_interface_listener_impl.h
@@ -22,7 +22,12 @@ class TcpClientListener;
*/
class InterfaceStatus {
public:
- InterfaceStatus() : flags_(0), has_ipv4_(false), has_ipv6_(false) {}
+ InterfaceStatus()
+ : flags_(0)
+ , has_ipv4_(false)
+ , has_ipv6_(false)
+ , ipv4_address_()
+ , ipv6_address_() {}
~InterfaceStatus() {}
bool IsAvailable() const;