summaryrefslogtreecommitdiffstats
path: root/core/io/file_access_buffered.cpp
diff options
context:
space:
mode:
authorTwistedTwigleg <beard.noah@gmail.com>2017-08-11 15:10:05 -0400
committerRémi Verschelde <rverschelde@gmail.com>2017-08-16 17:22:23 +0200
commit00f6c859282bb4dab3f6b4f6c20c44222221ebe9 (patch)
treeab3d2bae1ce8e9661480535a6442c94e5aeafd83 /core/io/file_access_buffered.cpp
parentb1ecaaa22b8dd87a75db414cb84ad0f60d5d4cef (diff)
downloadredot-engine-00f6c859282bb4dab3f6b4f6c20c44222221ebe9.tar.gz
Synchronize parameter names in definition and declaration
Fixes #10244.
Diffstat (limited to 'core/io/file_access_buffered.cpp')
-rw-r--r--core/io/file_access_buffered.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/io/file_access_buffered.cpp b/core/io/file_access_buffered.cpp
index 81adbbbaf7..126ec7575e 100644
--- a/core/io/file_access_buffered.cpp
+++ b/core/io/file_access_buffered.cpp
@@ -106,11 +106,11 @@ uint8_t FileAccessBuffered::get_8() const {
return byte;
};
-int FileAccessBuffered::get_buffer(uint8_t *p_dest, int p_elements) const {
+int FileAccessBuffered::get_buffer(uint8_t *p_dest, int p_length) const {
ERR_FAIL_COND_V(!file.open, -1);
- if (p_elements > cache_size) {
+ if (p_length > cache_size) {
int total_read = 0;
@@ -122,12 +122,12 @@ int FileAccessBuffered::get_buffer(uint8_t *p_dest, int p_elements) const {
//memcpy(p_dest, read.ptr() + (file.offset - cache.offset), size);
memcpy(p_dest, cache.buffer.ptr() + (file.offset - cache.offset), size);
p_dest += size;
- p_elements -= size;
+ p_length -= size;
file.offset += size;
total_read += size;
};
- int err = read_data_block(file.offset, p_elements, p_dest);
+ int err = read_data_block(file.offset, p_length, p_dest);
if (err >= 0) {
total_read += err;
file.offset += err;
@@ -136,7 +136,7 @@ int FileAccessBuffered::get_buffer(uint8_t *p_dest, int p_elements) const {
return total_read;
};
- int to_read = p_elements;
+ int to_read = p_length;
int total_read = 0;
while (to_read > 0) {
@@ -161,7 +161,7 @@ int FileAccessBuffered::get_buffer(uint8_t *p_dest, int p_elements) const {
to_read -= r;
};
- return p_elements;
+ return p_length;
};
bool FileAccessBuffered::is_open() const {