diff options
7 files changed, 9 insertions, 9 deletions
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index b169839f23..d5f9f9b7f8 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -803,7 +803,7 @@ class ApplicationManagerImpl mobile_apis::Result::eType SaveBinary(const std::vector<uint8_t>& binary_data, const std::string& file_path, const std::string& file_name, - const int64_t offset) OVERRIDE; + const uint64_t offset) OVERRIDE; /** * @brief Get available app space diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h index f82af197b9..2783280f87 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h @@ -70,7 +70,7 @@ class PutFileRequest : public app_mngr::commands::CommandRequestImpl { virtual void Run(); private: - int64_t offset_; + uint64_t offset_; std::string sync_file_name_; int64_t length_; mobile_apis::FileType::eType file_type_; diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index c40b5292ca..74e7b05f8e 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -2997,7 +2997,7 @@ mobile_apis::Result::eType ApplicationManagerImpl::SaveBinary( const std::vector<uint8_t>& binary_data, const std::string& file_path, const std::string& file_name, - const int64_t offset) { + const uint64_t offset) { LOG4CXX_DEBUG(logger_, "SaveBinaryWithOffset binary_size = " << binary_data.size() << " offset = " << offset); @@ -3008,7 +3008,7 @@ mobile_apis::Result::eType ApplicationManagerImpl::SaveBinary( } const std::string full_file_path = file_path + "/" + file_name; - const int64_t file_size = file_system::FileSize(full_file_path); + const uint64_t file_size = file_system::FileSize(full_file_path); std::ofstream* file_stream; if (offset != 0) { if (file_size != offset) { diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h index bce2878f69..9b482b9e62 100644 --- a/src/components/include/application_manager/application_manager.h +++ b/src/components/include/application_manager/application_manager.h @@ -472,7 +472,7 @@ class ApplicationManager { const std::vector<uint8_t>& binary_data, const std::string& file_path, const std::string& file_name, - const int64_t offset) = 0; + const uint64_t offset) = 0; /* * @brief Sets SDL access to all mobile apps * diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h index c4405b0ffd..e6e39bce58 100644 --- a/src/components/include/test/application_manager/mock_application_manager.h +++ b/src/components/include/test/application_manager/mock_application_manager.h @@ -186,7 +186,7 @@ class MockApplicationManager : public application_manager::ApplicationManager { mobile_apis::Result::eType(const std::vector<uint8_t>& binary_data, const std::string& file_path, const std::string& file_name, - const int64_t offset)); + const uint64_t offset)); MOCK_METHOD1(SetAllAppsAllowed, void(const bool allowed)); MOCK_METHOD1( set_driver_distraction_state, diff --git a/src/components/utils/include/utils/file_system.h b/src/components/utils/include/utils/file_system.h index 61495d462c..e26fef34bb 100644 --- a/src/components/utils/include/utils/file_system.h +++ b/src/components/utils/include/utils/file_system.h @@ -66,7 +66,7 @@ size_t DirectorySize(const std::string& path); * @param path to file * @return size of file, return 0 if file not exist */ -int64_t FileSize(const std::string& path); +uint64_t FileSize(const std::string& path); /** * @brief Creates directory with owner_all permissions diff --git a/src/components/utils/src/file_system.cc b/src/components/utils/src/file_system.cc index 19a6388fcf..a1e14ec9c5 100644 --- a/src/components/utils/src/file_system.cc +++ b/src/components/utils/src/file_system.cc @@ -65,10 +65,10 @@ uint64_t file_system::GetAvailableDiskSpace(const std::string& path) { } } -int64_t file_system::FileSize(const std::string& path) { +uint64_t file_system::FileSize(const std::string& path) { error_code ec; // Boost returns sizes as unsigned - int64_t fsize = (int64_t)fs::file_size(path, ec); + uint64_t fsize = (uint64_t)fs::file_size(path, ec); if (ec) { LOG4CXX_WARN_WITH_ERRNO(logger_, "Could not get file size: " << path); |