parent
85cb3c044d
commit
cdf3099c68
10 changed files with 26 additions and 3 deletions
|
@ -286,8 +286,10 @@ uint8_t FileAccessCompressed::get_8() const {
|
|||
}
|
||||
|
||||
int FileAccessCompressed::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use.");
|
||||
ERR_FAIL_COND_V_MSG(writing, 0, "File has not been opened in read mode.");
|
||||
ERR_FAIL_COND_V(!p_dst, -1);
|
||||
ERR_FAIL_COND_V(p_length < 0, -1);
|
||||
ERR_FAIL_COND_V_MSG(!f, -1, "File must be opened before use.");
|
||||
ERR_FAIL_COND_V_MSG(writing, -1, "File has not been opened in read mode.");
|
||||
|
||||
if (at_end) {
|
||||
read_eof = true;
|
||||
|
|
|
@ -237,7 +237,9 @@ uint8_t FileAccessEncrypted::get_8() const {
|
|||
}
|
||||
|
||||
int FileAccessEncrypted::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
ERR_FAIL_COND_V_MSG(writing, 0, "File has not been opened in read mode.");
|
||||
ERR_FAIL_COND_V(!p_dst, -1);
|
||||
ERR_FAIL_COND_V(p_length < 0, -1);
|
||||
ERR_FAIL_COND_V_MSG(writing, -1, "File has not been opened in read mode.");
|
||||
|
||||
int to_copy = MIN(p_length, data.size() - pos);
|
||||
for (int i = 0; i < to_copy; i++) {
|
||||
|
|
|
@ -138,6 +138,8 @@ uint8_t FileAccessMemory::get_8() const {
|
|||
}
|
||||
|
||||
int FileAccessMemory::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
ERR_FAIL_COND_V(!p_dst, -1);
|
||||
ERR_FAIL_COND_V(p_length < 0, -1);
|
||||
ERR_FAIL_COND_V(!data, -1);
|
||||
|
||||
int left = length - pos;
|
||||
|
|
|
@ -366,6 +366,9 @@ void FileAccessNetwork::_queue_page(int p_page) const {
|
|||
}
|
||||
|
||||
int FileAccessNetwork::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
ERR_FAIL_COND_V(!p_dst, -1);
|
||||
ERR_FAIL_COND_V(p_length < 0, -1);
|
||||
|
||||
//bool eof=false;
|
||||
if (pos + p_length > total_size) {
|
||||
eof_flag = true;
|
||||
|
|
|
@ -299,6 +299,9 @@ uint8_t FileAccessPack::get_8() const {
|
|||
}
|
||||
|
||||
int FileAccessPack::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
ERR_FAIL_COND_V(!p_dst, -1);
|
||||
ERR_FAIL_COND_V(p_length < 0, -1);
|
||||
|
||||
if (eof) {
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -303,6 +303,8 @@ uint8_t FileAccessZip::get_8() const {
|
|||
}
|
||||
|
||||
int FileAccessZip::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
ERR_FAIL_COND_V(!p_dst, -1);
|
||||
ERR_FAIL_COND_V(p_length < 0, -1);
|
||||
ERR_FAIL_COND_V(!zfile, -1);
|
||||
at_eof = unzeof(zfile);
|
||||
if (at_eof) {
|
||||
|
|
|
@ -368,6 +368,8 @@ Vector<String> FileAccess::get_csv_line(const String &p_delim) const {
|
|||
}
|
||||
|
||||
int FileAccess::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
ERR_FAIL_COND_V(!p_dst, -1);
|
||||
ERR_FAIL_COND_V(p_length < 0, -1);
|
||||
int i = 0;
|
||||
for (i = 0; i < p_length && !eof_reached(); i++) {
|
||||
p_dst[i] = get_8();
|
||||
|
|
|
@ -240,6 +240,8 @@ uint8_t FileAccessUnix::get_8() const {
|
|||
}
|
||||
|
||||
int FileAccessUnix::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
ERR_FAIL_COND_V(!p_dst, -1);
|
||||
ERR_FAIL_COND_V(p_length < 0, -1);
|
||||
ERR_FAIL_COND_V_MSG(!f, -1, "File must be opened before use.");
|
||||
int read = fread(p_dst, 1, p_length, f);
|
||||
check_errors();
|
||||
|
|
|
@ -253,6 +253,8 @@ uint8_t FileAccessWindows::get_8() const {
|
|||
}
|
||||
|
||||
int FileAccessWindows::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
ERR_FAIL_COND_V(!p_dst, -1);
|
||||
ERR_FAIL_COND_V(p_length < 0, -1);
|
||||
ERR_FAIL_COND_V(!f, -1);
|
||||
if (flags == READ_WRITE || flags == WRITE_READ) {
|
||||
if (prev_op == WRITE) {
|
||||
|
|
|
@ -114,6 +114,9 @@ uint8_t FileAccessAndroid::get_8() const {
|
|||
}
|
||||
|
||||
int FileAccessAndroid::get_buffer(uint8_t *p_dst, int p_length) const {
|
||||
ERR_FAIL_COND_V(!p_dst, -1);
|
||||
ERR_FAIL_COND_V(p_length < 0, -1);
|
||||
|
||||
off_t r = AAsset_read(a, p_dst, p_length);
|
||||
|
||||
if (pos + p_length > len) {
|
||||
|
|
Loading…
Reference in a new issue