Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use pass by reference in ZIPPacker & ZIPReader signatures #81501

Merged
merged 1 commit into from
Sep 11, 2023
Merged

Use pass by reference in ZIPPacker & ZIPReader signatures #81501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/zip/zip_packer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "core/io/zip_io.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()) {
close();
}
Expand All @@ -55,7 +55,7 @@ Error ZIPPacker::close() {
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.");

zip_fileinfo zipfi;
Expand All @@ -76,7 +76,7 @@ Error ZIPPacker::start_file(String p_path) {
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.");

return zipWriteInFileInZip(zf, p_data.ptr(), p_data.size()) == ZIP_OK ? OK : FAILED;
Expand Down
6 changes: 3 additions & 3 deletions modules/zip/zip_packer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ class ZIPPacker : public RefCounted {
APPEND_ADDINZIP = 2,
};

Error open(String p_path, ZipAppend p_append);
Error open(const String &p_path, ZipAppend p_append);
Error close();

Error start_file(String p_path);
Error write_file(Vector<uint8_t> p_data);
Error start_file(const String &p_path);
Error write_file(const Vector<uint8_t> &p_data);
Error close_file();

ZIPPacker();
Expand Down
6 changes: 3 additions & 3 deletions modules/zip/zip_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "core/error/error_macros.h"
#include "core/io/zip_io.h"

Error ZIPReader::open(String p_path) {
Error ZIPReader::open(const String &p_path) {
if (fa.is_valid()) {
close();
}
Expand Down Expand Up @@ -81,7 +81,7 @@ PackedStringArray ZIPReader::get_files() {
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.");

int err = UNZ_OK;
Expand Down Expand Up @@ -118,7 +118,7 @@ PackedByteArray ZIPReader::read_file(String p_path, bool p_case_sensitive) {
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.");

int cs = p_case_sensitive ? 1 : 2;
Expand Down
6 changes: 3 additions & 3 deletions modules/zip/zip_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ class ZIPReader : public RefCounted {
static void _bind_methods();

public:
Error open(String p_path);
Error open(const String &p_path);
Error close();

PackedStringArray get_files();
PackedByteArray read_file(String p_path, bool p_case_sensitive);
bool file_exists(String p_path, bool p_case_sensitive);
PackedByteArray read_file(const String &p_path, bool p_case_sensitive);
bool file_exists(const String &p_path, bool p_case_sensitive);

ZIPReader();
~ZIPReader();
Expand Down