Moved file reading functionality into local functions

* it was moved into functions local to the respective compilation unit to improve readability
** splits DOM tree construction logic from the actual purpose of the external function

1 files changed, 14 insertions, 10 deletions

diff --git a/src/function/read_file.cc b/src/function/read_file.cc
index 83456c6..f531191 100644
--- a/src/function/read_file.cc
+++ b/src/function/read_file.cc
@@ -7,10 +7,21 @@
 
 #include "boost/filesystem/fstream.hpp"
 
-#include <fstream>
-
 #include "support/xerces_string_guard.h"
 
+namespace {
+
+inline std::string readFile(const boost::filesystem::path& filePath) {
+	boost::filesystem::ifstream file(filePath);
+
+	return std::string(
+		(std::istreambuf_iterator<char>(file)),
+		(std::istreambuf_iterator<char>())
+	);
+}
+
+}
+
 namespace InputXSLT {
 
 FunctionReadFile::FunctionReadFile(const FilesystemContext& context):
@@ -41,13 +52,6 @@ xalan::XObjectPtr FunctionReadFile::execute(
 		);
 
 		if ( boost::filesystem::is_regular_file(filePath) ) {
-			boost::filesystem::ifstream file(filePath);
-
-			const std::string fileContent(
-				(std::istreambuf_iterator<char>(file)),
-				(std::istreambuf_iterator<char>())
-			);
-
 			xercesc::DOMElement* const resultNode(
 				domDocument->createElement(*XercesStringGuard("result"))
 			);
@@ -59,7 +63,7 @@ xalan::XObjectPtr FunctionReadFile::execute(
 
 			xercesc::DOMText* const resultTextNode(
 				domDocument->createTextNode(
-					*XercesStringGuard(fileContent)
+					*XercesStringGuard(readFile(filePath))
 				)
 			);