1 files changed, 18 insertions, 41 deletions

diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp
index 4aa408a1f0..06bad9f385 100644
--- a/drivers/unix/file_access_unix.cpp
+++ b/drivers/unix/file_access_unix.cpp
@@ -63,19 +63,17 @@
 #endif
 
 void FileAccessUnix::check_errors() const {
-
 	ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
 
 	if (feof(f)) {
-
 		last_error = ERR_FILE_EOF;
 	}
 }
 
 Error FileAccessUnix::_open(const String &p_path, int p_mode_flags) {
-
-	if (f)
+	if (f) {
 		fclose(f);
+	}
 	f = nullptr;
 
 	path_src = p_path;
@@ -85,16 +83,17 @@ Error FileAccessUnix::_open(const String &p_path, int p_mode_flags) {
 	ERR_FAIL_COND_V_MSG(f, ERR_ALREADY_IN_USE, "File is already in use.");
 	const char *mode_string;
 
-	if (p_mode_flags == READ)
+	if (p_mode_flags == READ) {
 		mode_string = "rb";
-	else if (p_mode_flags == WRITE)
+	} else if (p_mode_flags == WRITE) {
 		mode_string = "wb";
-	else if (p_mode_flags == READ_WRITE)
+	} else if (p_mode_flags == READ_WRITE) {
 		mode_string = "rb+";
-	else if (p_mode_flags == WRITE_READ)
+	} else if (p_mode_flags == WRITE_READ) {
 		mode_string = "wb+";
-	else
+	} else {
 		return ERR_INVALID_PARAMETER;
+	}
 
 	/* pretty much every implementation that uses fopen as primary
 	   backend (unix-compatible mostly) supports utf8 encoding */
@@ -150,9 +149,9 @@ Error FileAccessUnix::_open(const String &p_path, int p_mode_flags) {
 }
 
 void FileAccessUnix::close() {
-
-	if (!f)
+	if (!f) {
 		return;
+	}
 
 	fclose(f);
 	f = nullptr;
@@ -174,39 +173,35 @@ void FileAccessUnix::close() {
 }
 
 bool FileAccessUnix::is_open() const {
-
 	return (f != nullptr);
 }
 
 String FileAccessUnix::get_path() const {
-
 	return path_src;
 }
 
 String FileAccessUnix::get_path_absolute() const {
-
 	return path;
 }
 
 void FileAccessUnix::seek(size_t p_position) {
-
 	ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
 
 	last_error = OK;
-	if (fseek(f, p_position, SEEK_SET))
+	if (fseek(f, p_position, SEEK_SET)) {
 		check_errors();
+	}
 }
 
 void FileAccessUnix::seek_end(int64_t p_position) {
-
 	ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
 
-	if (fseek(f, p_position, SEEK_END))
+	if (fseek(f, p_position, SEEK_END)) {
 		check_errors();
+	}
 }
 
 size_t FileAccessUnix::get_position() const {
-
 	ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use.");
 
 	long pos = ftell(f);
@@ -218,7 +213,6 @@ size_t FileAccessUnix::get_position() const {
 }
 
 size_t FileAccessUnix::get_len() const {
-
 	ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use.");
 
 	long pos = ftell(f);
@@ -232,12 +226,10 @@ size_t FileAccessUnix::get_len() const {
 }
 
 bool FileAccessUnix::eof_reached() const {
-
 	return last_error == ERR_FILE_EOF;
 }
 
 uint8_t FileAccessUnix::get_8() const {
-
 	ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use.");
 	uint8_t b;
 	if (fread(&b, 1, 1, f) == 0) {
@@ -248,7 +240,6 @@ uint8_t FileAccessUnix::get_8() const {
 }
 
 int FileAccessUnix::get_buffer(uint8_t *p_dst, int p_length) const {
-
 	ERR_FAIL_COND_V_MSG(!f, -1, "File must be opened before use.");
 	int read = fread(p_dst, 1, p_length, f);
 	check_errors();
@@ -256,44 +247,41 @@ int FileAccessUnix::get_buffer(uint8_t *p_dst, int p_length) const {
 };
 
 Error FileAccessUnix::get_error() const {
-
 	return last_error;
 }
 
 void FileAccessUnix::flush() {
-
 	ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
 	fflush(f);
 }
 
 void FileAccessUnix::store_8(uint8_t p_dest) {
-
 	ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
 	ERR_FAIL_COND(fwrite(&p_dest, 1, 1, f) != 1);
 }
 
 void FileAccessUnix::store_buffer(const uint8_t *p_src, int p_length) {
-
 	ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
 	ERR_FAIL_COND(!p_src);
 	ERR_FAIL_COND((int)fwrite(p_src, 1, p_length, f) != p_length);
 }
 
 bool FileAccessUnix::file_exists(const String &p_path) {
-
 	int err;
 	struct stat st;
 	String filename = fix_path(p_path);
 
 	// Does the name exist at all?
 	err = stat(filename.utf8().get_data(), &st);
-	if (err)
+	if (err) {
 		return false;
+	}
 
 #ifdef UNIX_ENABLED
 	// See if we have access to the file
-	if (access(filename.utf8().get_data(), F_OK))
+	if (access(filename.utf8().get_data(), F_OK)) {
 		return false;
+	}
 #else
 	if (_access(filename.utf8().get_data(), 4) == -1)
 		return false;
@@ -310,7 +298,6 @@ bool FileAccessUnix::file_exists(const String &p_path) {
 }
 
 uint64_t FileAccessUnix::_get_modified_time(const String &p_file) {
-
 	String file = fix_path(p_file);
 	struct stat flags;
 	int err = stat(file.utf8().get_data(), &flags);
@@ -323,7 +310,6 @@ uint64_t FileAccessUnix::_get_modified_time(const String &p_file) {
 }
 
 uint32_t FileAccessUnix::_get_unix_permissions(const String &p_file) {
-
 	String file = fix_path(p_file);
 	struct stat flags;
 	int err = stat(file.utf8().get_data(), &flags);
@@ -336,7 +322,6 @@ uint32_t FileAccessUnix::_get_unix_permissions(const String &p_file) {
 }
 
 Error FileAccessUnix::_set_unix_permissions(const String &p_file, uint32_t p_permissions) {
-
 	String file = fix_path(p_file);
 
 	int err = chmod(file.utf8().get_data(), p_permissions);
@@ -348,20 +333,12 @@ Error FileAccessUnix::_set_unix_permissions(const String &p_file, uint32_t p_per
 }
 
 FileAccess *FileAccessUnix::create_libc() {
-
 	return memnew(FileAccessUnix);
 }
 
 CloseNotificationFunc FileAccessUnix::close_notification_func = nullptr;
 
-FileAccessUnix::FileAccessUnix() :
-		f(nullptr),
-		flags(0),
-		last_error(OK) {
-}
-
 FileAccessUnix::~FileAccessUnix() {
-
 	close();
 }