Merge branch 'master' into master

1 files changed, 15 insertions, 15 deletions

diff --git a/src/script/cpp_api/s_security.h b/src/script/cpp_api/s_security.h
index 73e763548..075950845 100644
--- a/src/script/cpp_api/s_security.h
+++ b/src/script/cpp_api/s_security.h
@@ -21,22 +21,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "cpp_api/s_base.h"
 
-
-#define CHECK_SECURE_PATH_INTERNAL(L, path, write_required, ptr) \
-	if (!ScriptApiSecurity::checkPath(L, path, write_required, ptr)) { \
-		throw LuaError(std::string("Mod security: Blocked attempted ") + \
-				(write_required ? "write to " : "read from ") + path); \
+#define CHECK_SECURE_PATH_INTERNAL(L, path, write_required, ptr)                         \
+	if (!ScriptApiSecurity::checkPath(L, path, write_required, ptr)) {               \
+		throw LuaError(std::string("Mod security: Blocked attempted ") +         \
+				(write_required ? "write to " : "read from ") + path);   \
 	}
-#define CHECK_SECURE_PATH(L, path, write_required) \
-	if (ScriptApiSecurity::isSecure(L)) { \
-		CHECK_SECURE_PATH_INTERNAL(L, path, write_required, NULL); \
+#define CHECK_SECURE_PATH(L, path, write_required)                                       \
+	if (ScriptApiSecurity::isSecure(L)) {                                            \
+		CHECK_SECURE_PATH_INTERNAL(L, path, write_required, NULL);               \
 	}
-#define CHECK_SECURE_PATH_POSSIBLE_WRITE(L, path, ptr) \
-	if (ScriptApiSecurity::isSecure(L)) { \
-		CHECK_SECURE_PATH_INTERNAL(L, path, false, ptr); \
+#define CHECK_SECURE_PATH_POSSIBLE_WRITE(L, path, ptr)                                   \
+	if (ScriptApiSecurity::isSecure(L)) {                                            \
+		CHECK_SECURE_PATH_INTERNAL(L, path, false, ptr);                         \
 	}
 
-
 class ScriptApiSecurity : virtual public ScriptApiBase
 {
 public:
@@ -51,12 +49,14 @@ public:
 	// Checks if the Lua state has been secured
 	static bool isSecure(lua_State *L);
 	// Loads a string as Lua code safely (doesn't allow bytecode).
-	static bool safeLoadString(lua_State *L, const std::string &code, const char *chunk_name);
+	static bool safeLoadString(
+			lua_State *L, const std::string &code, const char *chunk_name);
 	// Loads a file as Lua code safely (doesn't allow bytecode).
-	static bool safeLoadFile(lua_State *L, const char *path, const char *display_name = NULL);
+	static bool safeLoadFile(
+			lua_State *L, const char *path, const char *display_name = NULL);
 	// Checks if mods are allowed to read (and optionally write) to the path
 	static bool checkPath(lua_State *L, const char *path, bool write_required,
-			bool *write_allowed=NULL);
+			bool *write_allowed = NULL);
 
 private:
 	// Syntax: "sl_" <Library name or 'g' (global)> '_' <Function name>