Merge branch 'master' into dragonboarddragonboard

2 files changed, 9 insertions, 30 deletions

diff --git a/thermal/Config.cpp b/thermal/Config.cpp
index bfb2e39..c289c31 100644
--- a/thermal/Config.cpp
+++ b/thermal/Config.cpp
@@ -242,46 +242,28 @@ bool Config::readCoolingDevice(Json::Value &coolingDevice)
 	return true;
 }
 
-bool Config::readFile(const std::string path, std::stringstream &config)
+bool Config::parseFile(std::string path, Json::Value &root)
 {
-	std::ifstream file;
+	Json::CharReaderBuilder builder;
+	std::string strerr;
+	std::ifstream ifs;
 
 	LOG(DEBUG) << "Reading configuration file: " << path;
 
-	file.open(path);
-	if (!file) {
+	ifs.open(path);
+	if (!ifs) {
 		LOG(ERROR) << "Failed to open: " << path;
 		return false;
 	}
-
-	config << file.rdbuf();
-
-	LOG(DEBUG) << config.str();
 	
-	file.close();
-
-	return true;
-}
-	
-bool Config::parseFile(std::string path, Json::Value &root)
-{
-	std::stringstream config;
-	std::string strerr;
-
-	Json::CharReaderBuilder builder;
-	std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
-
-	if (!readFile(path, config)) {
-		LOG(ERROR) << "Failed to read configuration file";
-		return false;
-	}
-
-	if (!reader->parse(&*config.str().begin(), &*config.str().end(), &root, &strerr)) {
+	if (!parseFromStream(builder, ifs, &root, &strerr))  {
 		LOG(ERROR) << "Failed to parse JSON config: " << strerr;
 		return false;
 	}
 
 	LOG(DEBUG) << "Configuration file parsed successfully";
+
+	ifs.close();
 	
 	return true;
 }
diff --git a/thermal/Config.h b/thermal/Config.h
index 35186d8..0ea48bf 100644
--- a/thermal/Config.h
+++ b/thermal/Config.h
@@ -67,9 +67,6 @@ private:
 	
 	bool readSensor(Json::Value &sensor);
 
-	bool readFile(const std::string path,
-		      std::stringstream &config);
-
 	bool parseFile(std::string path, Json::Value &root);
 
 public: