From 190a845505b1142166e8b25d953ab20d19276b87 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Fri, 18 Jun 2021 05:03:07 +0800
Subject: [PATCH] util.cc: refactor read_file (#21295)

* mode read & open once

* change return statement for better readibility

* apply reviews

* Update selfdrive/common/util.cc

* fix

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
---
 selfdrive/common/util.cc | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/selfdrive/common/util.cc b/selfdrive/common/util.cc
index af87d9c22f..ab623caed4 100644
--- a/selfdrive/common/util.cc
+++ b/selfdrive/common/util.cc
@@ -54,26 +54,24 @@ int set_core_affinity(int core) {
 namespace util {
 
 std::string read_file(const std::string& fn) {
-  std::ifstream ifs(fn, std::ios::binary | std::ios::ate);
-  if (ifs) {
-    int pos = ifs.tellg();
+  std::ifstream f(fn, std::ios::binary | std::ios::in | std::ios::ate);
+  if (f) {
+    int pos = f.tellg();
     if (pos > 0) {
       std::string result;
       result.resize(pos);
-      ifs.seekg(0, std::ios::beg);
-      ifs.read(result.data(), pos);
-      if (ifs) {
+      f.seekg(0, std::ios::beg);
+      if (f.read(result.data(), pos)) {
         return result;
       }
+    } else {
+      // fallback for files created on read, e.g. procfs
+      std::stringstream buffer;
+      buffer << f.rdbuf();
+      return buffer.str();
     }
   }
-  ifs.close();
-
-  // fallback for files created on read, e.g. procfs
-  std::ifstream f(fn);
-  std::stringstream buffer;
-  buffer << f.rdbuf();
-  return buffer.str();
+  return std::string();
 }
 
 int read_files_in_dir(const std::string &path, std::map<std::string, std::string> *contents) {