From c694e85be09fac510fc4a630ea63e19748b6c2a8 Mon Sep 17 00:00:00 2001 From: deanlee Date: Tue, 19 Jan 2021 15:27:29 +0800 Subject: [PATCH] move file_exists to util.h --- selfdrive/common/util.h | 6 ++++++ selfdrive/loggerd/logger.cc | 9 ++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/selfdrive/common/util.h b/selfdrive/common/util.h index 96b3d6d5e1..2797cbd44a 100644 --- a/selfdrive/common/util.h +++ b/selfdrive/common/util.h @@ -96,6 +96,12 @@ inline std::string getenv_default(const char* env_var, const char * suffix, cons inline void sleep_for(const int milliseconds) { std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds)); } + +inline bool file_exists(const std::string& fn) { + std::ifstream f(fn); + return f.good(); +} + } class ExitHandler { diff --git a/selfdrive/loggerd/logger.cc b/selfdrive/loggerd/logger.cc index 1440820f57..83db489bff 100644 --- a/selfdrive/loggerd/logger.cc +++ b/selfdrive/loggerd/logger.cc @@ -33,18 +33,13 @@ void append_property(const char* key, const char* value, void *cookie) { properties->push_back(std::make_pair(std::string(key), std::string(value))); } -static bool file_exists(const std::string& fn) { - std::ifstream f(fn); - return f.good(); -} - kj::Array gen_init_data() { MessageBuilder msg; auto init = msg.initEvent().initInitData(); - if (file_exists("/EON")) { + if (util::file_exists("/EON")) { init.setDeviceType(cereal::InitData::DeviceType::NEO); - } else if (file_exists("/TICI")) { + } else if (util::file_exists("/TICI")) { init.setDeviceType(cereal::InitData::DeviceType::TICI); } else { init.setDeviceType(cereal::InitData::DeviceType::PC);