diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-17 16:02:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-17 16:02:12 +0200 |
commit | b0a51bf9fe6b35cf4e2a76ec067d76349ca9b75c (patch) | |
tree | 905b5c483a9dab81bc19fbfe9893e17f02506720 /platform/android/file_access_android.cpp | |
parent | 45e0f9fd523cb861b8e432966577d7c4608564ad (diff) | |
parent | 469fa47e0646d8f2ca3237dede8a04568039c7c6 (diff) |
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/android/file_access_android.cpp')
-rw-r--r-- | platform/android/file_access_android.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/android/file_access_android.cpp b/platform/android/file_access_android.cpp index 705891713f..900d4d9b20 100644 --- a/platform/android/file_access_android.cpp +++ b/platform/android/file_access_android.cpp @@ -71,8 +71,9 @@ bool FileAccessAndroid::is_open() const { return a != nullptr; } -void FileAccessAndroid::seek(size_t p_position) { +void FileAccessAndroid::seek(uint64_t p_position) { ERR_FAIL_COND(!a); + AAsset_seek(a, p_position, SEEK_SET); pos = p_position; if (pos > len) { @@ -89,11 +90,11 @@ void FileAccessAndroid::seek_end(int64_t p_position) { pos = len + p_position; } -size_t FileAccessAndroid::get_position() const { +uint64_t FileAccessAndroid::get_position() const { return pos; } -size_t FileAccessAndroid::get_len() const { +uint64_t FileAccessAndroid::get_len() const { return len; } @@ -113,11 +114,10 @@ uint8_t FileAccessAndroid::get_8() const { return byte; } -int FileAccessAndroid::get_buffer(uint8_t *p_dst, int p_length) const { +uint64_t FileAccessAndroid::get_buffer(uint8_t *p_dst, uint64_t p_length) const { ERR_FAIL_COND_V(!p_dst && p_length > 0, -1); - ERR_FAIL_COND_V(p_length < 0, -1); - off_t r = AAsset_read(a, p_dst, p_length); + int r = AAsset_read(a, p_dst, p_length); if (pos + p_length > len) { eof = true; |