From a1952df4dcd5c733d7624e5f8bad0ac42cda94da Mon Sep 17 00:00:00 2001
From: john30 <ebusd@johnm.de>
Date: Fri, 23 Dec 2016 14:00:01 +0100
Subject: [PATCH] formatting

---
 src/lib/ebus/message.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 src/lib/ebus/message.cpp

diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp
old mode 100644
new mode 100755
index df25d79f..aa705194
--- a/src/lib/ebus/message.cpp
+++ b/src/lib/ebus/message.cpp
@@ -1676,8 +1676,9 @@ result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<s
 	string types = *restart;
 	Condition* condition = NULL;
 	result_t result = readConditions(types, filename, condition);
-	if (result!=RESULT_OK)
+	if (result!=RESULT_OK) {
 		return result;
+	}
 	if (types.length()>0 && types[0]=='!') {
 		// instruction
 		types = types.substr(1);
@@ -1697,11 +1698,11 @@ result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<s
 		}
 		return RESULT_OK;
 	}
-	if (types.length() == 0)
+	if (types.length() == 0) {
 		types.append("r");
-	else if (types.find(']')!=string::npos)
+	} else if (types.find(']')!=string::npos) {
 		return RESULT_ERR_INVALID_ARG;
-
+	}
 	result = RESULT_ERR_EOF;
 	DataFieldTemplates* templates = getTemplates(filename);
 	istringstream stream(types);
@@ -1717,16 +1718,19 @@ result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<s
 			Message* message = *it;
 			if (result == RESULT_OK) {
 				result = add(message);
-				if (result==RESULT_ERR_DUPLICATE_NAME)
+				if (result==RESULT_ERR_DUPLICATE_NAME) {
 					begin = restart+3; // mark name as invalid
-				else if (result==RESULT_ERR_DUPLICATE)
+				} else if (result==RESULT_ERR_DUPLICATE) {
 					begin = restart+8; // mark ID as invalid
+				}
 			}
-			if (result != RESULT_OK)
+			if (result != RESULT_OK) {
 				delete message; // delete all remaining messages on error
+			}
 		}
-		if (result != RESULT_OK)
+		if (result != RESULT_OK) {
 			return result;
+		}
 	}
 	return result;
 }