1 files changed, 13 insertions, 32 deletions

diff --git a/platform/android/file_access_android.cpp b/platform/android/file_access_android.cpp
index 965342b364..90370878b7 100644
--- a/platform/android/file_access_android.cpp
+++ b/platform/android/file_access_android.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -29,22 +29,19 @@
 /*************************************************************************/
 
 #include "file_access_android.h"
-#include "core/print_string.h"
+#include "core/string/print_string.h"
 
-AAssetManager *FileAccessAndroid::asset_manager = NULL;
+AAssetManager *FileAccessAndroid::asset_manager = nullptr;
 
 /*void FileAccessAndroid::make_default() {
-
 	create_func=create_android;
 }*/
 
 FileAccess *FileAccessAndroid::create_android() {
-
 	return memnew(FileAccessAndroid);
 }
 
 Error FileAccessAndroid::_open(const String &p_path, int p_mode_flags) {
-
 	String path = fix_path(p_path).simplify_path();
 	if (path.begins_with("/"))
 		path = path.substr(1, path.length());
@@ -64,21 +61,19 @@ Error FileAccessAndroid::_open(const String &p_path, int p_mode_flags) {
 }
 
 void FileAccessAndroid::close() {
-
 	if (!a)
 		return;
 	AAsset_close(a);
-	a = NULL;
+	a = nullptr;
 }
 
 bool FileAccessAndroid::is_open() const {
-
-	return a != NULL;
+	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) {
@@ -90,29 +85,24 @@ void FileAccessAndroid::seek(size_t p_position) {
 }
 
 void FileAccessAndroid::seek_end(int64_t p_position) {
-
 	ERR_FAIL_COND(!a);
 	AAsset_seek(a, p_position, SEEK_END);
 	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_length() const {
 	return len;
 }
 
 bool FileAccessAndroid::eof_reached() const {
-
 	return eof;
 }
 
 uint8_t FileAccessAndroid::get_8() const {
-
 	if (pos >= len) {
 		eof = true;
 		return 0;
@@ -124,16 +114,16 @@ 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);
 
-	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;
 	}
 
 	if (r >= 0) {
-
 		pos += r;
 		if (pos > len) {
 			pos = len;
@@ -143,22 +133,18 @@ int FileAccessAndroid::get_buffer(uint8_t *p_dst, int p_length) const {
 }
 
 Error FileAccessAndroid::get_error() const {
-
 	return eof ? ERR_FILE_EOF : OK; //not sure what else it may happen
 }
 
 void FileAccessAndroid::flush() {
-
 	ERR_FAIL();
 }
 
 void FileAccessAndroid::store_8(uint8_t p_dest) {
-
 	ERR_FAIL();
 }
 
 bool FileAccessAndroid::file_exists(const String &p_path) {
-
 	String path = fix_path(p_path).simplify_path();
 	if (path.begins_with("/"))
 		path = path.substr(1, path.length());
@@ -174,11 +160,6 @@ bool FileAccessAndroid::file_exists(const String &p_path) {
 	return true;
 }
 
-FileAccessAndroid::FileAccessAndroid() {
-	a = NULL;
-	eof = false;
-}
-
 FileAccessAndroid::~FileAccessAndroid() {
 	close();
 }