Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks

drivers/windows/dir_access_windows.cpp

@@ -53,7 +53,6 @@
 */
 
 struct DirAccessWindowsPrivate {
-
 	HANDLE h; //handle for findfirstfile
 	WIN32_FIND_DATA f;
 	WIN32_FIND_DATAW fu; //unicode version
@@ -62,7 +61,6 @@ struct DirAccessWindowsPrivate {
 // CreateFolderAsync
 
 Error DirAccessWindows::list_dir_begin() {
-
 	_cisdir = false;
 	_cishidden = false;
 
@@ -73,7 +71,6 @@ Error DirAccessWindows::list_dir_begin() {
 }
 
 String DirAccessWindows::get_next() {
-
 	if (p->h == INVALID_HANDLE_VALUE)
 		return "";
 
@@ -83,7 +80,6 @@ String DirAccessWindows::get_next() {
 	String name = p->fu.cFileName;
 
 	if (FindNextFileW(p->h, &p->fu) == 0) {
-
 		FindClose(p->h);
 		p->h = INVALID_HANDLE_VALUE;
 	}
@@ -92,29 +88,23 @@ String DirAccessWindows::get_next() {
 }
 
 bool DirAccessWindows::current_is_dir() const {
-
 	return _cisdir;
 }
 
 bool DirAccessWindows::current_is_hidden() const {
-
 	return _cishidden;
 }
 
 void DirAccessWindows::list_dir_end() {
-
 	if (p->h != INVALID_HANDLE_VALUE) {
-
 		FindClose(p->h);
 		p->h = INVALID_HANDLE_VALUE;
 	}
 }
 int DirAccessWindows::get_drive_count() {
-
 	return drive_count;
 }
 String DirAccessWindows::get_drive(int p_drive) {
-
 	if (p_drive < 0 || p_drive >= drive_count)
 		return "";
 
@@ -122,7 +112,6 @@ String DirAccessWindows::get_drive(int p_drive) {
 }
 
 Error DirAccessWindows::change_dir(String p_dir) {
-
 	GLOBAL_LOCK_FUNCTION
 
 	p_dir = fix_path(p_dir);
@@ -136,7 +125,6 @@ Error DirAccessWindows::change_dir(String p_dir) {
 
 	String base = _get_root_path();
 	if (base != "") {
-
 		GetCurrentDirectoryW(2048, real_current_dir_name);
 		String new_dir;
 		new_dir = String(real_current_dir_name).replace("\\", "/");
@@ -146,7 +134,6 @@ Error DirAccessWindows::change_dir(String p_dir) {
 	}
 
 	if (worked) {
-
 		GetCurrentDirectoryW(2048, real_current_dir_name);
 		current_dir = real_current_dir_name; // TODO, utf8 parser
 		current_dir = current_dir.replace("\\", "/");
@@ -160,7 +147,6 @@ Error DirAccessWindows::change_dir(String p_dir) {
 }
 
 Error DirAccessWindows::make_dir(String p_dir) {
-
 	GLOBAL_LOCK_FUNCTION
 
 	p_dir = fix_path(p_dir);
@@ -190,10 +176,8 @@ Error DirAccessWindows::make_dir(String p_dir) {
 }
 
 String DirAccessWindows::get_current_dir() {
-
 	String base = _get_root_path();
 	if (base != "") {
-
 		String bd = current_dir.replace("\\", "/").replace_first(base, "");
 		if (bd.begins_with("/"))
 			return _get_root_string() + bd.substr(1, bd.length());
@@ -207,7 +191,6 @@ String DirAccessWindows::get_current_dir() {
 }
 
 String DirAccessWindows::get_current_dir_without_drive() {
-
 	String dir = get_current_dir();
 
 	if (_get_root_string() == "") {
@@ -221,7 +204,6 @@ String DirAccessWindows::get_current_dir_without_drive() {
 }
 
 bool DirAccessWindows::file_exists(String p_file) {
-
 	GLOBAL_LOCK_FUNCTION
 
 	if (!p_file.is_abs_path())
@@ -243,7 +225,6 @@ bool DirAccessWindows::file_exists(String p_file) {
 }
 
 bool DirAccessWindows::dir_exists(String p_dir) {
-
 	GLOBAL_LOCK_FUNCTION
 
 	if (p_dir.is_rel_path())
@@ -264,7 +245,6 @@ bool DirAccessWindows::dir_exists(String p_dir) {
 }
 
 Error DirAccessWindows::rename(String p_path, String p_new_path) {
-
 	if (p_path.is_rel_path())
 		p_path = get_current_dir().plus_file(p_path);
 
@@ -302,7 +282,6 @@ Error DirAccessWindows::rename(String p_path, String p_new_path) {
 }
 
 Error DirAccessWindows::remove(String p_path) {
-
 	if (p_path.is_rel_path())
 		p_path = get_current_dir().plus_file(p_path);
 
@@ -347,7 +326,6 @@ FileType DirAccessWindows::get_file_type(const String& p_file) const {
 }
 */
 size_t DirAccessWindows::get_space_left() {
-
 	uint64_t bytes = 0;
 	if (!GetDiskFreeSpaceEx(NULL, (PULARGE_INTEGER)&bytes, NULL, NULL))
 		return 0;
@@ -377,7 +355,6 @@ String DirAccessWindows::get_filesystem_type() const {
 				&dwFileSystemFlags,
 				szFileSystemName,
 				sizeof(szFileSystemName)) == TRUE) {
-
 		return String(szFileSystemName);
 	}
 
@@ -385,7 +362,6 @@ String DirAccessWindows::get_filesystem_type() const {
 }
 
 DirAccessWindows::DirAccessWindows() {
-
 	p = memnew(DirAccessWindowsPrivate);
 	p->h = INVALID_HANDLE_VALUE;
 	current_dir = ".";
@@ -401,7 +377,6 @@ DirAccessWindows::DirAccessWindows() {
 	DWORD mask = GetLogicalDrives();
 
 	for (int i = 0; i < MAX_DRIVES; i++) {
-
 		if (mask & (1 << i)) { //DRIVE EXISTS
 
 			drives[drive_count] = 'A' + i;
@@ -414,7 +389,6 @@ DirAccessWindows::DirAccessWindows() {
 }
 
 DirAccessWindows::~DirAccessWindows() {
-
 	memdelete(p);
 }
 

drivers/windows/dir_access_windows.h

@@ -42,7 +42,6 @@
 struct DirAccessWindowsPrivate;
 
 class DirAccessWindows : public DirAccess {
-
 	enum {
 		MAX_DRIVES = 26
 	};

drivers/windows/file_access_windows.cpp

@@ -49,17 +49,14 @@
 #endif
 
 void FileAccessWindows::check_errors() const {
-
 	ERR_FAIL_COND(!f);
 
 	if (feof(f)) {
-
 		last_error = ERR_FILE_EOF;
 	}
 }
 
 Error FileAccessWindows::_open(const String &p_path, int p_mode_flags) {
-
 	path_src = p_path;
 	path = fix_path(p_path);
 	if (f)
@@ -83,7 +80,6 @@ Error FileAccessWindows::_open(const String &p_path, int p_mode_flags) {
 
 	struct _stat st;
 	if (_wstat(path.c_str(), &st) == 0) {
-
 		if (!S_ISREG(st.st_mode))
 			return ERR_FILE_CANT_OPEN;
 	};
@@ -99,7 +95,6 @@ Error FileAccessWindows::_open(const String &p_path, int p_mode_flags) {
 		if (f != INVALID_HANDLE_VALUE) {
 			String fname = d.cFileName;
 			if (fname != String()) {
-
 				String base_file = path.get_file();
 				if (base_file != fname && base_file.findn(fname) == 0) {
 					WARN_PRINTS("Case mismatch opening requested file '" + base_file + "', stored as '" + fname + "' in the filesystem. This file will not open when exported to other case-sensitive platforms.");
@@ -135,7 +130,6 @@ Error FileAccessWindows::_open(const String &p_path, int p_mode_flags) {
 }
 
 void FileAccessWindows::close() {
-
 	if (!f)
 		return;
 
@@ -143,7 +137,6 @@ void FileAccessWindows::close() {
 	f = NULL;
 
 	if (save_path != "") {
-
 		bool rename_error = true;
 		int attempts = 4;
 		while (rename_error && attempts) {
@@ -185,21 +178,17 @@ void FileAccessWindows::close() {
 }
 
 String FileAccessWindows::get_path() const {
-
 	return path_src;
 }
 
 String FileAccessWindows::get_path_absolute() const {
-
 	return path;
 }
 
 bool FileAccessWindows::is_open() const {
-
 	return (f != NULL);
 }
 void FileAccessWindows::seek(size_t p_position) {
-
 	ERR_FAIL_COND(!f);
 	last_error = OK;
 	if (fseek(f, p_position, SEEK_SET))
@@ -207,14 +196,12 @@ void FileAccessWindows::seek(size_t p_position) {
 	prev_op = 0;
 }
 void FileAccessWindows::seek_end(int64_t p_position) {
-
 	ERR_FAIL_COND(!f);
 	if (fseek(f, p_position, SEEK_END))
 		check_errors();
 	prev_op = 0;
 }
 size_t FileAccessWindows::get_position() const {
-
 	size_t aux_position = 0;
 	aux_position = ftell(f);
 	if (!aux_position) {
@@ -223,7 +210,6 @@ size_t FileAccessWindows::get_position() const {
 	return aux_position;
 }
 size_t FileAccessWindows::get_len() const {
-
 	ERR_FAIL_COND_V(!f, 0);
 
 	size_t pos = get_position();
@@ -235,13 +221,11 @@ size_t FileAccessWindows::get_len() const {
 }
 
 bool FileAccessWindows::eof_reached() const {
-
 	check_errors();
 	return last_error == ERR_FILE_EOF;
 }
 
 uint8_t FileAccessWindows::get_8() const {
-
 	ERR_FAIL_COND_V(!f, 0);
 	if (flags == READ_WRITE || flags == WRITE_READ) {
 		if (prev_op == WRITE) {
@@ -274,12 +258,10 @@ int FileAccessWindows::get_buffer(uint8_t *p_dst, int p_length) const {
 };
 
 Error FileAccessWindows::get_error() const {
-
 	return last_error;
 }
 
 void FileAccessWindows::flush() {
-
 	ERR_FAIL_COND(!f);
 	fflush(f);
 	if (prev_op == WRITE)
@@ -287,7 +269,6 @@ void FileAccessWindows::flush() {
 }
 
 void FileAccessWindows::store_8(uint8_t p_dest) {
-
 	ERR_FAIL_COND(!f);
 	if (flags == READ_WRITE || flags == WRITE_READ) {
 		if (prev_op == READ) {
@@ -314,23 +295,19 @@ void FileAccessWindows::store_buffer(const uint8_t *p_src, int p_length) {
 }
 
 bool FileAccessWindows::file_exists(const String &p_name) {
-
 	FILE *g;
 	//printf("opening file %s\n", p_fname.c_str());
 	String filename = fix_path(p_name);
 	_wfopen_s(&g, filename.c_str(), L"rb");
 	if (g == NULL) {
-
 		return false;
 	} else {
-
 		fclose(g);
 		return true;
 	}
 }
 
 uint64_t FileAccessWindows::_get_modified_time(const String &p_file) {
-
 	String file = fix_path(p_file);
 	if (file.ends_with("/") && file != "/")
 		file = file.substr(0, file.length() - 1);
@@ -339,7 +316,6 @@ uint64_t FileAccessWindows::_get_modified_time(const String &p_file) {
 	int rv = _wstat(file.c_str(), &st);
 
 	if (rv == 0) {
-
 		return st.st_mtime;
 	} else {
 		ERR_FAIL_V_MSG(0, "Failed to get modified time for: " + file + ".");
@@ -361,7 +337,6 @@ FileAccessWindows::FileAccessWindows() :
 		last_error(OK) {
 }
 FileAccessWindows::~FileAccessWindows() {
-
 	close();
 }
 

drivers/windows/file_access_windows.h

@@ -39,7 +39,6 @@
 #include <stdio.h>
 
 class FileAccessWindows : public FileAccess {
-
 	FILE *f;
 	int flags;
 	void check_errors() const;