From 5dbf1809c6e3e905b94b8764e99491e608122261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 5 Mar 2017 16:44:50 +0100 Subject: 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 --- core/os/file_access.cpp | 284 ++++++++++++++++++++++-------------------------- 1 file changed, 127 insertions(+), 157 deletions(-) (limited to 'core/os/file_access.cpp') diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index ae592720e8..3aac1f6f21 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -27,42 +27,39 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "file_access.h" -#include "global_config.h" -#include "os/os.h" +#include "core/io/file_access_pack.h" #include "core/io/marshalls.h" +#include "global_config.h" #include "io/md5.h" #include "io/sha256.h" -#include "core/io/file_access_pack.h" - -FileAccess::CreateFunc FileAccess::create_func[ACCESS_MAX]={0,0}; +#include "os/os.h" -FileAccess::FileCloseFailNotify FileAccess::close_fail_notify=NULL; +FileAccess::CreateFunc FileAccess::create_func[ACCESS_MAX] = { 0, 0 }; +FileAccess::FileCloseFailNotify FileAccess::close_fail_notify = NULL; -bool FileAccess::backup_save=false; +bool FileAccess::backup_save = false; -FileAccess *FileAccess::create(AccessType p_access){ +FileAccess *FileAccess::create(AccessType p_access) { - ERR_FAIL_COND_V( !create_func, 0 ); - ERR_FAIL_INDEX_V( p_access,ACCESS_MAX, 0 ); + ERR_FAIL_COND_V(!create_func, 0); + ERR_FAIL_INDEX_V(p_access, ACCESS_MAX, 0); FileAccess *ret = create_func[p_access](); ret->_set_access_type(p_access); return ret; } -bool FileAccess::exists(const String& p_name) { +bool FileAccess::exists(const String &p_name) { if (PackedData::get_singleton()->has_path(p_name)) return true; - FileAccess *f=open(p_name,READ); + FileAccess *f = open(p_name, READ); if (!f) return false; memdelete(f); return true; - - } void FileAccess::_set_access_type(AccessType p_access) { @@ -70,9 +67,9 @@ void FileAccess::_set_access_type(AccessType p_access) { _access_type = p_access; }; -FileAccess *FileAccess::create_for_path(const String& p_path) { +FileAccess *FileAccess::create_for_path(const String &p_path) { - FileAccess *ret=NULL; + FileAccess *ret = NULL; if (p_path.begins_with("res://")) { ret = create(ACCESS_RESOURCES); @@ -86,56 +83,52 @@ FileAccess *FileAccess::create_for_path(const String& p_path) { } return ret; - - } -Error FileAccess::reopen(const String& p_path, int p_mode_flags) { +Error FileAccess::reopen(const String &p_path, int p_mode_flags) { return _open(p_path, p_mode_flags); }; - -FileAccess *FileAccess::open(const String& p_path, int p_mode_flags, Error *r_error) { +FileAccess *FileAccess::open(const String &p_path, int p_mode_flags, Error *r_error) { //try packed data first - FileAccess *ret=NULL; - if (!(p_mode_flags&WRITE) && PackedData::get_singleton() && !PackedData::get_singleton()->is_disabled()) { + FileAccess *ret = NULL; + if (!(p_mode_flags & WRITE) && PackedData::get_singleton() && !PackedData::get_singleton()->is_disabled()) { ret = PackedData::get_singleton()->try_open_path(p_path); if (ret) { if (r_error) - *r_error=OK; + *r_error = OK; return ret; } } - ret=create_for_path(p_path); - Error err = ret->_open(p_path,p_mode_flags); + ret = create_for_path(p_path); + Error err = ret->_open(p_path, p_mode_flags); if (r_error) - *r_error=err; - if (err!=OK) { + *r_error = err; + if (err != OK) { memdelete(ret); - ret=NULL; + ret = NULL; } return ret; } - FileAccess::CreateFunc FileAccess::get_create_func(AccessType p_access) { return create_func[p_access]; }; -String FileAccess::fix_path(const String& p_path) const { +String FileAccess::fix_path(const String &p_path) const { //helper used by file accesses that use a single filesystem String r_path = p_path.replace("\\", "/"); - switch(_access_type) { + switch (_access_type) { case ACCESS_RESOURCES: { @@ -145,23 +138,21 @@ String FileAccess::fix_path(const String& p_path) const { String resource_path = GlobalConfig::get_singleton()->get_resource_path(); if (resource_path != "") { - return r_path.replace("res:/",resource_path); + return r_path.replace("res:/", resource_path); }; return r_path.replace("res://", ""); } } - } break; case ACCESS_USERDATA: { - if (r_path.begins_with("user://")) { - String data_dir=OS::get_singleton()->get_data_dir(); + String data_dir = OS::get_singleton()->get_data_dir(); if (data_dir != "") { - return r_path.replace("user:/",data_dir); + return r_path.replace("user:/", data_dir); }; return r_path.replace("user://", ""); } @@ -178,63 +169,62 @@ String FileAccess::fix_path(const String& p_path) const { /* these are all implemented for ease of porting, then can later be optimized */ -uint16_t FileAccess::get_16()const { +uint16_t FileAccess::get_16() const { uint16_t res; - uint8_t a,b; + uint8_t a, b; - a=get_8(); - b=get_8(); + a = get_8(); + b = get_8(); if (endian_swap) { - SWAP( a,b ); + SWAP(a, b); } - res=b; - res<<=8; - res|=a; + res = b; + res <<= 8; + res |= a; return res; } -uint32_t FileAccess::get_32() const{ +uint32_t FileAccess::get_32() const { uint32_t res; - uint16_t a,b; + uint16_t a, b; - a=get_16(); - b=get_16(); + a = get_16(); + b = get_16(); if (endian_swap) { - SWAP( a,b ); + SWAP(a, b); } - res=b; - res<<=16; - res|=a; + res = b; + res <<= 16; + res |= a; return res; } -uint64_t FileAccess::get_64()const { +uint64_t FileAccess::get_64() const { uint64_t res; - uint32_t a,b; + uint32_t a, b; - a=get_32(); - b=get_32(); + a = get_32(); + b = get_32(); if (endian_swap) { - SWAP( a,b ); + SWAP(a, b); } - res=b; - res<<=32; - res|=a; + res = b; + res <<= 32; + res |= a; return res; - } float FileAccess::get_float() const { @@ -250,7 +240,6 @@ real_t FileAccess::get_real() const { return get_double(); else return get_float(); - } double FileAccess::get_double() const { @@ -264,17 +253,17 @@ String FileAccess::get_line() const { CharString line; - CharType c=get_8(); + CharType c = get_8(); - while(!eof_reached()) { + while (!eof_reached()) { - if (c=='\n' || c=='\0') { + if (c == '\n' || c == '\0') { line.push_back(0); return String::utf8(line.get_data()); - } else if (c!='\r') + } else if (c != '\r') line.push_back(c); - c=get_8(); + c = get_8(); } line.push_back(0); return String::utf8(line.get_data()); @@ -282,51 +271,48 @@ String FileAccess::get_line() const { Vector FileAccess::get_csv_line(String delim) const { - ERR_FAIL_COND_V(delim.length()!=1,Vector()); + ERR_FAIL_COND_V(delim.length() != 1, Vector()); String l; - int qc=0; + int qc = 0; do { - l+=get_line()+"\n"; - qc=0; - for(int i=0;i strings; - bool in_quote=false; + bool in_quote = false; String current; - for(int i=0;i FileAccess::get_csv_line(String delim) const { return strings; } +int FileAccess::get_buffer(uint8_t *p_dst, int p_length) const { -int FileAccess::get_buffer(uint8_t *p_dst,int p_length) const{ - - int i=0; - for (i=0; i>8; + a = p_dest & 0xFF; + b = p_dest >> 8; if (endian_swap) { - SWAP( a,b ); + SWAP(a, b); } store_8(a); store_8(b); - } void FileAccess::store_32(uint32_t p_dest) { + uint16_t a, b; - uint16_t a,b; - - a=p_dest&0xFFFF; - b=p_dest>>16; + a = p_dest & 0xFFFF; + b = p_dest >> 16; if (endian_swap) { - SWAP( a,b ); + SWAP(a, b); } store_16(a); store_16(b); - } void FileAccess::store_64(uint64_t p_dest) { - uint32_t a,b; + uint32_t a, b; - a=p_dest&0xFFFFFFFF; - b=p_dest>>32; + a = p_dest & 0xFFFFFFFF; + b = p_dest >> 32; if (endian_swap) { - SWAP( a,b ); + SWAP(a, b); } store_32(a); store_32(b); - } void FileAccess::store_real(real_t p_real) { - if (sizeof(real_t)==4) + if (sizeof(real_t) == 4) store_float(p_real); else store_double(p_real); - } void FileAccess::store_float(float p_dest) { @@ -417,40 +397,39 @@ void FileAccess::store_double(double p_dest) { store_64(m.l); }; -uint64_t FileAccess::get_modified_time(const String& p_file) { +uint64_t FileAccess::get_modified_time(const String &p_file) { FileAccess *fa = create_for_path(p_file); - ERR_FAIL_COND_V(!fa,0); + ERR_FAIL_COND_V(!fa, 0); uint64_t mt = fa->_get_modified_time(p_file); memdelete(fa); return mt; } -void FileAccess::store_string(const String& p_string) { +void FileAccess::store_string(const String &p_string) { - if (p_string.length()==0) + if (p_string.length() == 0) return; - CharString cs=p_string.utf8(); - store_buffer((uint8_t*)&cs[0],cs.length()); - + CharString cs = p_string.utf8(); + store_buffer((uint8_t *)&cs[0], cs.length()); } -void FileAccess::store_pascal_string(const String& p_string) { +void FileAccess::store_pascal_string(const String &p_string) { CharString cs = p_string.utf8(); store_32(cs.length()); - store_buffer((uint8_t*)&cs[0], cs.length()); + store_buffer((uint8_t *)&cs[0], cs.length()); }; String FileAccess::get_pascal_string() { uint32_t sl = get_32(); CharString cs; - cs.resize(sl+1); - get_buffer((uint8_t*)cs.ptr(),sl); - cs[sl]=0; + cs.resize(sl + 1); + get_buffer((uint8_t *)cs.ptr(), sl); + cs[sl] = 0; String ret; ret.parse_utf8(cs.ptr()); @@ -458,35 +437,32 @@ String FileAccess::get_pascal_string() { return ret; }; - -void FileAccess::store_line(const String& p_line) { +void FileAccess::store_line(const String &p_line) { store_string(p_line); store_8('\n'); } -void FileAccess::store_buffer(const uint8_t *p_src,int p_length) { +void FileAccess::store_buffer(const uint8_t *p_src, int p_length) { - for (int i=0;i FileAccess::get_file_as_array(const String& p_file) { +Vector FileAccess::get_file_as_array(const String &p_file) { - FileAccess *f=FileAccess::open(p_file,READ); - ERR_FAIL_COND_V(!f,Vector()); + FileAccess *f = FileAccess::open(p_file, READ); + ERR_FAIL_COND_V(!f, Vector()); Vector data; data.resize(f->get_len()); - f->get_buffer(data.ptr(),data.size()); + f->get_buffer(data.ptr(), data.size()); memdelete(f); return data; - - } -String FileAccess::get_md5(const String& p_file) { +String FileAccess::get_md5(const String &p_file) { - FileAccess *f=FileAccess::open(p_file,READ); + FileAccess *f = FileAccess::open(p_file, READ); if (!f) return String(); @@ -495,32 +471,28 @@ String FileAccess::get_md5(const String& p_file) { unsigned char step[32768]; - while(true) { + while (true) { - int br = f->get_buffer(step,32768); - if (br>0) { + int br = f->get_buffer(step, 32768); + if (br > 0) { - MD5Update(&md5,step,br); + MD5Update(&md5, step, br); } if (br < 4096) break; - } MD5Final(&md5); String ret = String::md5(md5.digest); - - memdelete(f); return ret; - } -String FileAccess::get_sha256(const String& p_file) { +String FileAccess::get_sha256(const String &p_file) { - FileAccess *f=FileAccess::open(p_file,READ); + FileAccess *f = FileAccess::open(p_file, READ); if (!f) return String(); @@ -529,16 +501,15 @@ String FileAccess::get_sha256(const String& p_file) { unsigned char step[32768]; - while(true) { + while (true) { - int br = f->get_buffer(step,32768); - if (br>0) { + int br = f->get_buffer(step, 32768); + if (br > 0) { - sha256_hash(&sha256,step,br); + sha256_hash(&sha256, step, br); } if (br < 4096) break; - } unsigned char hash[32]; @@ -547,12 +518,11 @@ String FileAccess::get_sha256(const String& p_file) { memdelete(f); return String::hex_encode_buffer(hash, 32); - } FileAccess::FileAccess() { - endian_swap=false; - real_is_double=false; - _access_type=ACCESS_FILESYSTEM; + endian_swap = false; + real_is_double = false; + _access_type = ACCESS_FILESYSTEM; }; -- cgit v1.2.3