1 files changed, 31 insertions, 41 deletions

diff --git a/core/io/zip_io.h b/core/io/zip_io.h
index c994593518..4da9fc9c8d 100644
--- a/core/io/zip_io.h
+++ b/core/io/zip_io.h
@@ -29,69 +29,65 @@
 #ifndef ZIP_IO_H
 #define ZIP_IO_H
 
-#include "io/zip.h"
 #include "io/unzip.h"
-#include "os/file_access.h"
+#include "io/zip.h"
 #include "os/copymem.h"
+#include "os/file_access.h"
 
+static void *zipio_open(void *data, const char *p_fname, int mode) {
 
-static void* zipio_open(void* data, const char* p_fname, int mode) {
-
-	FileAccess *&f = *(FileAccess**)data;
+	FileAccess *&f = *(FileAccess **)data;
 
 	String fname;
 	fname.parse_utf8(p_fname);
 
 	if (mode & ZLIB_FILEFUNC_MODE_WRITE) {
-		f = FileAccess::open(fname,FileAccess::WRITE);
+		f = FileAccess::open(fname, FileAccess::WRITE);
 	} else {
 
-		f = FileAccess::open(fname,FileAccess::READ);
+		f = FileAccess::open(fname, FileAccess::READ);
 	}
 
 	if (!f)
 		return NULL;
 
 	return data;
-
 };
 
-static uLong zipio_read(void* data, void* fdata, void* buf, uLong size) {
-
-	FileAccess* f = *(FileAccess**)data;
-	return f->get_buffer((uint8_t*)buf, size);
+static uLong zipio_read(void *data, void *fdata, void *buf, uLong size) {
 
+	FileAccess *f = *(FileAccess **)data;
+	return f->get_buffer((uint8_t *)buf, size);
 };
 
-static uLong zipio_write(voidpf opaque, voidpf stream, const void* buf, uLong size) {
+static uLong zipio_write(voidpf opaque, voidpf stream, const void *buf, uLong size) {
 
-	FileAccess* f = *(FileAccess**)opaque;
-	f->store_buffer((uint8_t*)buf, size);
+	FileAccess *f = *(FileAccess **)opaque;
+	f->store_buffer((uint8_t *)buf, size);
 	return size;
 };
 
+static long zipio_tell(voidpf opaque, voidpf stream) {
 
-static long zipio_tell (voidpf opaque, voidpf stream) {
-
-	FileAccess* f = *(FileAccess**)opaque;
+	FileAccess *f = *(FileAccess **)opaque;
 	return f->get_pos();
 };
 
 static long zipio_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);
@@ -100,36 +96,32 @@ static long zipio_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
 
 static int zipio_close(voidpf opaque, voidpf stream) {
 
-	FileAccess*& f = *(FileAccess**)opaque;
+	FileAccess *&f = *(FileAccess **)opaque;
 	if (f) {
 		f->close();
-		f=NULL;
+		f = NULL;
 	}
 	return 0;
 };
 
 static int zipio_testerror(voidpf opaque, voidpf stream) {
 
-	FileAccess* f = *(FileAccess**)opaque;
-	return (f && f->get_error()!=OK)?1:0;
+	FileAccess *f = *(FileAccess **)opaque;
+	return (f && f->get_error() != OK) ? 1 : 0;
 };
 
-
-
 static voidpf zipio_alloc(voidpf opaque, uInt items, uInt size) {
 
-	voidpf ptr =memalloc(items*size);
-	zeromem(ptr,items*size);
+	voidpf ptr = memalloc(items * size);
+	zeromem(ptr, items * size);
 	return ptr;
 }
 
-
 static void zipio_free(voidpf opaque, voidpf address) {
 
 	memfree(address);
 }
 
-
 static zlib_filefunc_def zipio_create_io_from_file(FileAccess **p_file) {
 
 	zlib_filefunc_def io;
@@ -141,11 +133,9 @@ static zlib_filefunc_def zipio_create_io_from_file(FileAccess **p_file) {
 	io.zseek_file = zipio_seek;
 	io.zclose_file = zipio_close;
 	io.zerror_file = zipio_testerror;
-	io.alloc_mem=zipio_alloc;
-	io.free_mem=zipio_free;
+	io.alloc_mem = zipio_alloc;
+	io.free_mem = zipio_free;
 	return io;
 }
 
-
-
 #endif // ZIP_IO_H