summaryrefslogtreecommitdiffstats
path: root/platform/javascript
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-05-17 16:02:12 +0200
committerGitHub <noreply@github.com>2021-05-17 16:02:12 +0200
commitb0a51bf9fe6b35cf4e2a76ec067d76349ca9b75c (patch)
tree905b5c483a9dab81bc19fbfe9893e17f02506720 /platform/javascript
parent45e0f9fd523cb861b8e432966577d7c4608564ad (diff)
parent469fa47e0646d8f2ca3237dede8a04568039c7c6 (diff)
downloadredot-engine-b0a51bf9fe6b35cf4e2a76ec067d76349ca9b75c.tar.gz
Merge pull request #48768 from akien-mga/file-access-64-bit-4.0
Make all file access 64-bit (`uint64_t`)
Diffstat (limited to 'platform/javascript')
-rw-r--r--platform/javascript/api/javascript_tools_editor_plugin.cpp2
-rw-r--r--platform/javascript/export/export.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/javascript/api/javascript_tools_editor_plugin.cpp b/platform/javascript/api/javascript_tools_editor_plugin.cpp
index 7a2c2b2335..015440f5be 100644
--- a/platform/javascript/api/javascript_tools_editor_plugin.cpp
+++ b/platform/javascript/api/javascript_tools_editor_plugin.cpp
@@ -79,7 +79,7 @@ void JavaScriptToolsEditorPlugin::_zip_file(String p_path, String p_base_path, z
return;
}
Vector<uint8_t> data;
- int len = f->get_len();
+ uint64_t len = f->get_len();
data.resize(len);
f->get_buffer(data.ptrw(), len);
f->close();
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp
index 951d86d09e..e398072312 100644
--- a/platform/javascript/export/export.cpp
+++ b/platform/javascript/export/export.cpp
@@ -170,8 +170,8 @@ public:
while (true) {
uint8_t bytes[4096];
- int read = f->get_buffer(bytes, 4096);
- if (read < 1) {
+ uint64_t read = f->get_buffer(bytes, 4096);
+ if (read == 0) {
break;
}
err = peer->put_data(bytes, read);