godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Use pass by reference in ZIPPacker & ZIPReader signatures

This commit is contained in:
Florian Kothmeier 2023-09-10 00:22:53 +02:00
parent fc99492d30
commit a41ae7d69c
No known key found for this signature in database
GPG Key ID: 1B676CDB21FBF963
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/zip/zip_packer.cpp
View File

@ -33,7 +33,7 @@
#include "core/io/zip_io.h" #include "core/io/zip_io.h"
#include "core/os/os.h" #include "core/os/os.h"
Error ZIPPacker::open(String p_path, ZipAppend p_append) { Error ZIPPacker::open(const String &p_path, ZipAppend p_append) {
if (fa.is_valid()) { if (fa.is_valid()) {
close(); close();
} }
@ -55,7 +55,7 @@ Error ZIPPacker::close() {
return err; return err;
} }
Error ZIPPacker::start_file(String p_path) { Error ZIPPacker::start_file(const String &p_path) {
ERR_FAIL_COND_V_MSG(fa.is_null(), FAILED, "ZIPPacker must be opened before use."); ERR_FAIL_COND_V_MSG(fa.is_null(), FAILED, "ZIPPacker must be opened before use.");
zip_fileinfo zipfi; zip_fileinfo zipfi;
@ -76,7 +76,7 @@ Error ZIPPacker::start_file(String p_path) {
return err == ZIP_OK ? OK : FAILED; return err == ZIP_OK ? OK : FAILED;
} }
Error ZIPPacker::write_file(Vector<uint8_t> p_data) { Error ZIPPacker::write_file(const Vector<uint8_t> &p_data) {
ERR_FAIL_COND_V_MSG(fa.is_null(), FAILED, "ZIPPacker must be opened before use."); ERR_FAIL_COND_V_MSG(fa.is_null(), FAILED, "ZIPPacker must be opened before use.");
return zipWriteInFileInZip(zf, p_data.ptr(), p_data.size()) == ZIP_OK ? OK : FAILED; return zipWriteInFileInZip(zf, p_data.ptr(), p_data.size()) == ZIP_OK ? OK : FAILED;

6
modules/zip/zip_packer.h
View File

@ -52,11 +52,11 @@ public:
APPEND_ADDINZIP = 2, APPEND_ADDINZIP = 2,
}; };
Error open(String p_path, ZipAppend p_append); Error open(const String &p_path, ZipAppend p_append);
Error close(); Error close();
Error start_file(String p_path); Error start_file(const String &p_path);
Error write_file(Vector<uint8_t> p_data); Error write_file(const Vector<uint8_t> &p_data);
Error close_file(); Error close_file();
ZIPPacker(); ZIPPacker();

6
modules/zip/zip_reader.cpp
View File

@ -33,7 +33,7 @@
#include "core/error/error_macros.h" #include "core/error/error_macros.h"
#include "core/io/zip_io.h" #include "core/io/zip_io.h"
Error ZIPReader::open(String p_path) { Error ZIPReader::open(const String &p_path) {
if (fa.is_valid()) { if (fa.is_valid()) {
close(); close();
} }
@ -81,7 +81,7 @@ PackedStringArray ZIPReader::get_files() {
return arr; return arr;
} }
PackedByteArray ZIPReader::read_file(String p_path, bool p_case_sensitive) { PackedByteArray ZIPReader::read_file(const String &p_path, bool p_case_sensitive) {
ERR_FAIL_COND_V_MSG(fa.is_null(), PackedByteArray(), "ZIPReader must be opened before use."); ERR_FAIL_COND_V_MSG(fa.is_null(), PackedByteArray(), "ZIPReader must be opened before use.");
int err = UNZ_OK; int err = UNZ_OK;
@ -118,7 +118,7 @@ PackedByteArray ZIPReader::read_file(String p_path, bool p_case_sensitive) {
return data; return data;
} }
bool ZIPReader::file_exists(String p_path, bool p_case_sensitive) { bool ZIPReader::file_exists(const String &p_path, bool p_case_sensitive) {
ERR_FAIL_COND_V_MSG(fa.is_null(), false, "ZIPReader must be opened before use."); ERR_FAIL_COND_V_MSG(fa.is_null(), false, "ZIPReader must be opened before use.");
int cs = p_case_sensitive ? 1 : 2; int cs = p_case_sensitive ? 1 : 2;

6
modules/zip/zip_reader.h
View File

@ -46,12 +46,12 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
Error open(String p_path); Error open(const String &p_path);
Error close(); Error close();
PackedStringArray get_files(); PackedStringArray get_files();
PackedByteArray read_file(String p_path, bool p_case_sensitive); PackedByteArray read_file(const String &p_path, bool p_case_sensitive);
bool file_exists(String p_path, bool p_case_sensitive); bool file_exists(const String &p_path, bool p_case_sensitive);
ZIPReader(); ZIPReader();
~ZIPReader(); ~ZIPReader();