A Whole New World (clang-format edition)

I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code

1 files changed, 66 insertions, 78 deletions

diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp
index ee51db6694..723bf3321a 100644
--- a/drivers/unix/file_access_unix.cpp
+++ b/drivers/unix/file_access_unix.cpp
@@ -30,20 +30,20 @@
 
 #if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED)
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "print_string.h"
 #include "core/os/os.h"
+#include "print_string.h"
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #ifndef ANDROID_ENABLED
 #include <sys/statvfs.h>
 #endif
 
 #ifdef MSVC
- #define S_ISREG(m) ((m)&_S_IFREG)
+#define S_ISREG(m) ((m)&_S_IFREG)
 #endif
 #ifndef S_ISREG
- #define S_ISREG(m) ((m) & S_IFREG)
+#define S_ISREG(m) ((m)&S_IFREG)
 #endif
 
 void FileAccessUnix::check_errors() const {
@@ -52,31 +52,30 @@ void FileAccessUnix::check_errors() const {
 
 	if (feof(f)) {
 
-		last_error=ERR_FILE_EOF;
+		last_error = ERR_FILE_EOF;
 	}
-
 }
 
-Error FileAccessUnix::_open(const String& p_path, int p_mode_flags) {
+Error FileAccessUnix::_open(const String &p_path, int p_mode_flags) {
 
 	if (f)
 		fclose(f);
-	f=NULL;
+	f = NULL;
 
-	path=fix_path(p_path);
+	path = fix_path(p_path);
 	//printf("opening %ls, %i\n", path.c_str(), Memory::get_static_mem_usage());
 
-	ERR_FAIL_COND_V(f,ERR_ALREADY_IN_USE);
-	const char* mode_string;
-
-	if (p_mode_flags==READ)
-		mode_string="rb";
-	else if (p_mode_flags==WRITE)
-		mode_string="wb";
-	else if (p_mode_flags==READ_WRITE)
-		mode_string="rb+";
-	else if (p_mode_flags==WRITE_READ)
-		mode_string="wb+";
+	ERR_FAIL_COND_V(f, ERR_ALREADY_IN_USE);
+	const char *mode_string;
+
+	if (p_mode_flags == READ)
+		mode_string = "rb";
+	else if (p_mode_flags == WRITE)
+		mode_string = "wb";
+	else if (p_mode_flags == READ_WRITE)
+		mode_string = "rb+";
+	else if (p_mode_flags == WRITE_READ)
+		mode_string = "wb+";
 	else
 		return ERR_INVALID_PARAMETER;
 
@@ -85,30 +84,28 @@ Error FileAccessUnix::_open(const String& p_path, int p_mode_flags) {
 
 	//printf("opening %s as %s\n", p_path.utf8().get_data(), path.utf8().get_data());
 	struct stat st;
-	if (stat(path.utf8().get_data(),&st) == 0) {
+	if (stat(path.utf8().get_data(), &st) == 0) {
 
 		if (!S_ISREG(st.st_mode))
 			return ERR_FILE_CANT_OPEN;
-
 	};
 
-	if (is_backup_save_enabled() && p_mode_flags&WRITE && !(p_mode_flags&READ)) {
-		save_path=path;
-		path=path+".tmp";
+	if (is_backup_save_enabled() && p_mode_flags & WRITE && !(p_mode_flags & READ)) {
+		save_path = path;
+		path = path + ".tmp";
 		//print_line("saving instead to "+path);
 	}
 
-	f=fopen(path.utf8().get_data(),mode_string);
+	f = fopen(path.utf8().get_data(), mode_string);
 
-	if (f==NULL) {
-		last_error=ERR_FILE_CANT_OPEN;
+	if (f == NULL) {
+		last_error = ERR_FILE_CANT_OPEN;
 		return ERR_FILE_CANT_OPEN;
 	} else {
-		last_error=OK;
-		flags=p_mode_flags;
+		last_error = OK;
+		flags = p_mode_flags;
 		return OK;
 	}
-
 }
 void FileAccessUnix::close() {
 
@@ -117,57 +114,53 @@ void FileAccessUnix::close() {
 	fclose(f);
 	f = NULL;
 	if (close_notification_func) {
-		close_notification_func(path,flags);
+		close_notification_func(path, flags);
 	}
-	if (save_path!="") {
+	if (save_path != "") {
 
 		//unlink(save_path.utf8().get_data());
 		//print_line("renaming..");
-		int rename_error = rename((save_path+".tmp").utf8().get_data(),save_path.utf8().get_data());
+		int rename_error = rename((save_path + ".tmp").utf8().get_data(), save_path.utf8().get_data());
 
 		if (rename_error && close_fail_notify) {
 			close_fail_notify(save_path);
 		}
 
-		save_path="";
-		ERR_FAIL_COND( rename_error != 0);
+		save_path = "";
+		ERR_FAIL_COND(rename_error != 0);
 	}
-
-
 }
-bool FileAccessUnix::is_open() const{
+bool FileAccessUnix::is_open() const {
 
-	return (f!=NULL);
+	return (f != NULL);
 }
 void FileAccessUnix::seek(size_t p_position) {
 
 	ERR_FAIL_COND(!f);
 
-	last_error=OK;
-	if ( fseek(f,p_position,SEEK_SET) )
+	last_error = OK;
+	if (fseek(f, p_position, SEEK_SET))
 		check_errors();
 }
-void FileAccessUnix::seek_end(int64_t p_position)  {
+void FileAccessUnix::seek_end(int64_t p_position) {
 
 	ERR_FAIL_COND(!f);
-	if ( fseek(f,p_position,SEEK_END) )
+	if (fseek(f, p_position, SEEK_END))
 		check_errors();
 }
-size_t FileAccessUnix::get_pos() const{
-
+size_t FileAccessUnix::get_pos() const {
 
-	size_t aux_position=0;
-	if ( !(aux_position = ftell(f)) ) {
+	size_t aux_position = 0;
+	if (!(aux_position = ftell(f))) {
 		check_errors();
 	};
 	return aux_position;
 }
-size_t FileAccessUnix::get_len() const{
+size_t FileAccessUnix::get_len() const {
 
+	ERR_FAIL_COND_V(!f, 0);
 
-	ERR_FAIL_COND_V(!f,0);
-
-	FileAccessUnix *fau = const_cast<FileAccessUnix*>(this);
+	FileAccessUnix *fau = const_cast<FileAccessUnix *>(this);
 	int pos = fau->get_pos();
 	fau->seek_end();
 	int size = fau->get_pos();
@@ -176,16 +169,16 @@ size_t FileAccessUnix::get_len() const{
 	return size;
 }
 
-bool FileAccessUnix::eof_reached() const{
+bool FileAccessUnix::eof_reached() const {
 
-	return last_error==ERR_FILE_EOF;
+	return last_error == ERR_FILE_EOF;
 }
 
-uint8_t FileAccessUnix::get_8() const{
+uint8_t FileAccessUnix::get_8() const {
 
-	ERR_FAIL_COND_V(!f,0);
+	ERR_FAIL_COND_V(!f, 0);
 	uint8_t b;
-	if (fread(&b,1,1,f) == 0) {
+	if (fread(&b, 1, 1, f) == 0) {
 		check_errors();
 	};
 
@@ -194,13 +187,13 @@ uint8_t FileAccessUnix::get_8() const{
 
 int FileAccessUnix::get_buffer(uint8_t *p_dst, int p_length) const {
 
-	ERR_FAIL_COND_V(!f,-1);
+	ERR_FAIL_COND_V(!f, -1);
 	int read = fread(p_dst, 1, p_length, f);
 	check_errors();
 	return read;
 };
 
-Error FileAccessUnix::get_error() const{
+Error FileAccessUnix::get_error() const {
 
 	return last_error;
 }
@@ -208,18 +201,16 @@ Error FileAccessUnix::get_error() const{
 void FileAccessUnix::store_8(uint8_t p_dest) {
 
 	ERR_FAIL_COND(!f);
-	fwrite(&p_dest,1,1,f);
-
+	fwrite(&p_dest, 1, 1, f);
 }
 
-
 bool FileAccessUnix::file_exists(const String &p_path) {
 
 	FILE *g;
 	//printf("opening file %s\n", p_fname.c_str());
-	String filename=fix_path(p_path);
-	g=fopen(filename.utf8().get_data(),"rb");
-	if (g==NULL) {
+	String filename = fix_path(p_path);
+	g = fopen(filename.utf8().get_data(), "rb");
+	if (g == NULL) {
 
 		return false;
 	} else {
@@ -231,38 +222,35 @@ bool FileAccessUnix::file_exists(const String &p_path) {
 
 uint64_t FileAccessUnix::_get_modified_time(const String &p_file) {
 
-	String file=fix_path(p_file);
+	String file = fix_path(p_file);
 	struct stat flags;
-	bool success = 	(stat(file.utf8().get_data(),&flags)==0);
+	bool success = (stat(file.utf8().get_data(), &flags) == 0);
 
 	if (success) {
 		return flags.st_mtime;
 	} else {
-		print_line("ERROR IN: "+p_file);
+		print_line("ERROR IN: " + p_file);
 
 		ERR_FAIL_V(0);
 	};
-
 }
 
-FileAccess * FileAccessUnix::create_libc() {
+FileAccess *FileAccessUnix::create_libc() {
 
-	return memnew( FileAccessUnix );
+	return memnew(FileAccessUnix);
 }
 
-CloseNotificationFunc FileAccessUnix::close_notification_func=NULL;
+CloseNotificationFunc FileAccessUnix::close_notification_func = NULL;
 
 FileAccessUnix::FileAccessUnix() {
 
-	f=NULL;
-	flags=0;
-	last_error=OK;
-
+	f = NULL;
+	flags = 0;
+	last_error = OK;
 }
 FileAccessUnix::~FileAccessUnix() {
 
 	close();
-
 }
 
 #endif