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
This commit is contained in:
Rémi Verschelde
parent
45438e9918
commit
5dbf1809c6
1318 changed files with 140051 additions and 166004 deletions
|
|
@ -30,78 +30,75 @@
|
|||
|
||||
#include "file_access_zip.h"
|
||||
|
||||
#include "core/os/file_access.h"
|
||||
#include "core/os/copymem.h"
|
||||
#include "core/os/file_access.h"
|
||||
|
||||
ZipArchive* ZipArchive::instance = NULL;
|
||||
ZipArchive *ZipArchive::instance = NULL;
|
||||
|
||||
extern "C" {
|
||||
|
||||
static void* godot_open(void* data, const char* p_fname, int mode) {
|
||||
static void *godot_open(void *data, const char *p_fname, int mode) {
|
||||
|
||||
if (mode & ZLIB_FILEFUNC_MODE_WRITE) {
|
||||
return NULL;
|
||||
};
|
||||
|
||||
FileAccess* f = (FileAccess*)data;
|
||||
FileAccess *f = (FileAccess *)data;
|
||||
f->open(p_fname, FileAccess::READ);
|
||||
|
||||
return f->is_open()?data:NULL;
|
||||
|
||||
return f->is_open() ? data : NULL;
|
||||
};
|
||||
|
||||
static uLong godot_read(void* data, void* fdata, void* buf, uLong size) {
|
||||
static uLong godot_read(void *data, void *fdata, void *buf, uLong size) {
|
||||
|
||||
FileAccess* f = (FileAccess*)data;
|
||||
f->get_buffer((uint8_t*)buf, size);
|
||||
FileAccess *f = (FileAccess *)data;
|
||||
f->get_buffer((uint8_t *)buf, size);
|
||||
return size;
|
||||
};
|
||||
|
||||
static uLong godot_write(voidpf opaque, voidpf stream, const void* buf, uLong size) {
|
||||
static uLong godot_write(voidpf opaque, voidpf stream, const void *buf, uLong size) {
|
||||
|
||||
return 0;
|
||||
};
|
||||
|
||||
static long godot_tell(voidpf opaque, voidpf stream) {
|
||||
|
||||
static long godot_tell (voidpf opaque, voidpf stream) {
|
||||
|
||||
FileAccess* f = (FileAccess*)opaque;
|
||||
FileAccess *f = (FileAccess *)opaque;
|
||||
return f->get_pos();
|
||||
};
|
||||
|
||||
static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
|
||||
|
||||
FileAccess* f = (FileAccess*)opaque;
|
||||
FileAccess *f = (FileAccess *)opaque;
|
||||
|
||||
int pos = offset;
|
||||
switch (origin) {
|
||||
|
||||
case ZLIB_FILEFUNC_SEEK_CUR:
|
||||
pos = f->get_pos() + offset;
|
||||
break;
|
||||
case ZLIB_FILEFUNC_SEEK_END:
|
||||
pos = f->get_len() + offset;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
case ZLIB_FILEFUNC_SEEK_CUR:
|
||||
pos = f->get_pos() + offset;
|
||||
break;
|
||||
case ZLIB_FILEFUNC_SEEK_END:
|
||||
pos = f->get_len() + offset;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
};
|
||||
|
||||
f->seek(pos);
|
||||
return 0;
|
||||
};
|
||||
|
||||
|
||||
static int godot_close(voidpf opaque, voidpf stream) {
|
||||
|
||||
FileAccess* f = (FileAccess*)opaque;
|
||||
FileAccess *f = (FileAccess *)opaque;
|
||||
f->close();
|
||||
return 0;
|
||||
};
|
||||
|
||||
static int godot_testerror(voidpf opaque, voidpf stream) {
|
||||
|
||||
FileAccess* f = (FileAccess*)opaque;
|
||||
return f->get_error()!=OK?1:0;
|
||||
FileAccess *f = (FileAccess *)opaque;
|
||||
return f->get_error() != OK ? 1 : 0;
|
||||
};
|
||||
|
||||
static voidpf godot_alloc(voidpf opaque, uInt items, uInt size) {
|
||||
|
|
@ -119,7 +116,7 @@ static void godot_free(voidpf opaque, voidpf address) {
|
|||
void ZipArchive::close_handle(unzFile p_file) const {
|
||||
|
||||
ERR_FAIL_COND(!p_file);
|
||||
FileAccess* f = (FileAccess*)unzGetOpaque(p_file);
|
||||
FileAccess *f = (FileAccess *)unzGetOpaque(p_file);
|
||||
unzCloseCurrentFile(p_file);
|
||||
unzClose(p_file);
|
||||
memdelete(f);
|
||||
|
|
@ -130,7 +127,7 @@ unzFile ZipArchive::get_file_handle(String p_file) const {
|
|||
ERR_FAIL_COND_V(!file_exists(p_file), NULL);
|
||||
File file = files[p_file];
|
||||
|
||||
FileAccess* f = FileAccess::open(packages[file.package].filename, FileAccess::READ);
|
||||
FileAccess *f = FileAccess::open(packages[file.package].filename, FileAccess::READ);
|
||||
ERR_FAIL_COND_V(!f, NULL);
|
||||
|
||||
zlib_filefunc_def io;
|
||||
|
|
@ -162,7 +159,7 @@ unzFile ZipArchive::get_file_handle(String p_file) const {
|
|||
return pkg;
|
||||
};
|
||||
|
||||
bool ZipArchive::try_open_pack(const String& p_name) {
|
||||
bool ZipArchive::try_open_pack(const String &p_name) {
|
||||
|
||||
//printf("opening zip pack %ls, %i, %i\n", p_name.c_str(), p_name.extension().nocasecmp_to("zip"), p_name.extension().nocasecmp_to("pcz"));
|
||||
if (p_name.get_extension().nocasecmp_to("zip") != 0 && p_name.get_extension().nocasecmp_to("pcz") != 0)
|
||||
|
|
@ -170,7 +167,7 @@ bool ZipArchive::try_open_pack(const String& p_name) {
|
|||
|
||||
zlib_filefunc_def io;
|
||||
|
||||
FileAccess* f = FileAccess::open(p_name, FileAccess::READ);
|
||||
FileAccess *f = FileAccess::open(p_name, FileAccess::READ);
|
||||
if (!f)
|
||||
return false;
|
||||
io.opaque = f;
|
||||
|
|
@ -188,20 +185,20 @@ bool ZipArchive::try_open_pack(const String& p_name) {
|
|||
|
||||
unz_global_info64 gi;
|
||||
int err = unzGetGlobalInfo64(zfile, &gi);
|
||||
ERR_FAIL_COND_V(err!=UNZ_OK, false);
|
||||
ERR_FAIL_COND_V(err != UNZ_OK, false);
|
||||
|
||||
Package pkg;
|
||||
pkg.filename = p_name;
|
||||
pkg.zfile = zfile;
|
||||
packages.push_back(pkg);
|
||||
int pkg_num = packages.size()-1;
|
||||
int pkg_num = packages.size() - 1;
|
||||
|
||||
for (unsigned int i=0;i<gi.number_entry;i++) {
|
||||
for (unsigned int i = 0; i < gi.number_entry; i++) {
|
||||
|
||||
char filename_inzip[256];
|
||||
|
||||
unz_file_info64 file_info;
|
||||
err = unzGetCurrentFileInfo64(zfile,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
|
||||
err = unzGetCurrentFileInfo64(zfile, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0);
|
||||
ERR_CONTINUE(err != UNZ_OK);
|
||||
|
||||
File f;
|
||||
|
|
@ -211,11 +208,11 @@ bool ZipArchive::try_open_pack(const String& p_name) {
|
|||
String fname = String("res://") + filename_inzip;
|
||||
files[fname] = f;
|
||||
|
||||
uint8_t md5[16]={0,0,0,0,0,0,0,0 , 0,0,0,0,0,0,0,0};
|
||||
uint8_t md5[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
PackedData::get_singleton()->add_path(p_name, fname, 1, 0, md5, this);
|
||||
//printf("packed data add path %ls, %ls\n", p_name.c_str(), fname.c_str());
|
||||
|
||||
if ((i+1)<gi.number_entry) {
|
||||
if ((i + 1) < gi.number_entry) {
|
||||
unzGoToNextFile(zfile);
|
||||
};
|
||||
};
|
||||
|
|
@ -228,13 +225,12 @@ bool ZipArchive::file_exists(String p_name) const {
|
|||
return files.has(p_name);
|
||||
};
|
||||
|
||||
FileAccess* ZipArchive::get_file(const String& p_path, PackedData::PackedFile* p_file) {
|
||||
FileAccess *ZipArchive::get_file(const String &p_path, PackedData::PackedFile *p_file) {
|
||||
|
||||
return memnew(FileAccessZip(p_path, *p_file));
|
||||
};
|
||||
|
||||
|
||||
ZipArchive* ZipArchive::get_singleton() {
|
||||
ZipArchive *ZipArchive::get_singleton() {
|
||||
|
||||
if (instance == NULL) {
|
||||
instance = memnew(ZipArchive);
|
||||
|
|
@ -251,9 +247,9 @@ ZipArchive::ZipArchive() {
|
|||
|
||||
ZipArchive::~ZipArchive() {
|
||||
|
||||
for (int i=0; i<packages.size(); i++) {
|
||||
for (int i = 0; i < packages.size(); i++) {
|
||||
|
||||
FileAccess* f = (FileAccess*)unzGetOpaque(packages[i].zfile);
|
||||
FileAccess *f = (FileAccess *)unzGetOpaque(packages[i].zfile);
|
||||
unzClose(packages[i].zfile);
|
||||
memdelete(f);
|
||||
};
|
||||
|
|
@ -261,18 +257,17 @@ ZipArchive::~ZipArchive() {
|
|||
packages.clear();
|
||||
};
|
||||
|
||||
|
||||
Error FileAccessZip::_open(const String& p_path, int p_mode_flags) {
|
||||
Error FileAccessZip::_open(const String &p_path, int p_mode_flags) {
|
||||
|
||||
close();
|
||||
|
||||
ERR_FAIL_COND_V(p_mode_flags & FileAccess::WRITE, FAILED);
|
||||
ZipArchive* arch = ZipArchive::get_singleton();
|
||||
ZipArchive *arch = ZipArchive::get_singleton();
|
||||
ERR_FAIL_COND_V(!arch, FAILED);
|
||||
zfile = arch->get_file_handle(p_path);
|
||||
ERR_FAIL_COND_V(!zfile, FAILED);
|
||||
|
||||
int err = unzGetCurrentFileInfo64(zfile,&file_info,NULL,0,NULL,0,NULL,0);
|
||||
int err = unzGetCurrentFileInfo64(zfile, &file_info, NULL, 0, NULL, 0, NULL, 0);
|
||||
ERR_FAIL_COND_V(err != UNZ_OK, FAILED);
|
||||
|
||||
return OK;
|
||||
|
|
@ -283,7 +278,7 @@ void FileAccessZip::close() {
|
|||
if (!zfile)
|
||||
return;
|
||||
|
||||
ZipArchive* arch = ZipArchive::get_singleton();
|
||||
ZipArchive *arch = ZipArchive::get_singleton();
|
||||
ERR_FAIL_COND(!arch);
|
||||
arch->close_handle(zfile);
|
||||
zfile = NULL;
|
||||
|
|
@ -332,7 +327,7 @@ uint8_t FileAccessZip::get_8() const {
|
|||
return ret;
|
||||
};
|
||||
|
||||
int FileAccessZip::get_buffer(uint8_t *p_dst,int p_length) const {
|
||||
int FileAccessZip::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
|
||||
ERR_FAIL_COND_V(!zfile, -1);
|
||||
at_eof = unzeof(zfile);
|
||||
|
|
@ -363,13 +358,12 @@ void FileAccessZip::store_8(uint8_t p_dest) {
|
|||
ERR_FAIL();
|
||||
};
|
||||
|
||||
bool FileAccessZip::file_exists(const String& p_name) {
|
||||
bool FileAccessZip::file_exists(const String &p_name) {
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
|
||||
FileAccessZip::FileAccessZip(const String& p_path, const PackedData::PackedFile& p_file) {
|
||||
FileAccessZip::FileAccessZip(const String &p_path, const PackedData::PackedFile &p_file) {
|
||||
|
||||
zfile = NULL;
|
||||
_open(p_path, FileAccess::READ);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue