From 4ad929660954e49e4baa299c3eaa2a89e5267423 Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Sat, 26 Nov 2022 01:15:28 +0900
Subject: [PATCH] universal7885: aidl-support: Add new signature for readline()

std::string readline(const char *)
---
 .../apps/aidl-support/libfileio/FileIO.cpp          | 13 +++++++++----
 .../apps/aidl-support/libfileio/include/FileIO.h    |  3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/universal7885-common/apps/aidl-support/libfileio/FileIO.cpp b/universal7885-common/apps/aidl-support/libfileio/FileIO.cpp
index a2817f8..24414ef 100644
--- a/universal7885-common/apps/aidl-support/libfileio/FileIO.cpp
+++ b/universal7885-common/apps/aidl-support/libfileio/FileIO.cpp
@@ -7,9 +7,9 @@
 
 namespace FileIO {
 
-constexpr const int EXIT_ERR = -1;
+constexpr int ERR = -1;
 
-int readline(const char *path) {
+std::string readline(const char *path) {
   std::ifstream file;
   std::string value;
   file.open(path);
@@ -19,8 +19,13 @@ int readline(const char *path) {
     file.close();
   } else {
     LOG_E("%s: Failed to open %s", __func__, path);
-    return EXIT_ERR;
+    value = std::to_string(ERR);
   }
+  return value;
+}
+
+int readline(const char *path) {
+  const std::string value = readline(path);
   try {
     return stoi(value);
   } catch (std::invalid_argument const &ex) {
@@ -28,7 +33,7 @@ int readline(const char *path) {
   } catch (std::out_of_range const &ex) {
     LOG_E("%s: stoi(): out of range: for %s", __func__, value.c_str());
   }
-  return EXIT_ERR;
+  return ERR;
 }
 
 void writeline(const char *path, const std::string& data) {
diff --git a/universal7885-common/apps/aidl-support/libfileio/include/FileIO.h b/universal7885-common/apps/aidl-support/libfileio/include/FileIO.h
index 2c70d86..6b6bff3 100644
--- a/universal7885-common/apps/aidl-support/libfileio/include/FileIO.h
+++ b/universal7885-common/apps/aidl-support/libfileio/include/FileIO.h
@@ -1,4 +1,7 @@
+#include <string>
+
 namespace FileIO {
+  std::string readline(const char *path);
   int readline(const char *path);
 
   void writeline(const char *path, const std::string& data);