diff options
| author | Nils ANDRÉ-CHANG <nils@nilsand.re> | 2019-09-12 21:28:49 +0100 |
|---|---|---|
| committer | Nils ANDRÉ-CHANG <nils@nilsand.re> | 2019-09-26 20:36:12 +0100 |
| commit | 0024dd7bb5a8a5194ed0283fc506edcd8b4a7737 (patch) | |
| tree | 86316cccbf4fda58a275a7451e37fda83465bb20 /core/io/file_access_buffered.cpp | |
| parent | cafb888361eba08297dd88b18dc71f4d418525c0 (diff) | |
| parent | 24e1039eb6fe32115e8d1a62a84965e9be19a2ed (diff) | |
Merge branch 'master' into tab_key
Diffstat (limited to 'core/io/file_access_buffered.cpp')
| -rw-r--r-- | core/io/file_access_buffered.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/core/io/file_access_buffered.cpp b/core/io/file_access_buffered.cpp index 15523a49a9..f72ad61da6 100644 --- a/core/io/file_access_buffered.cpp +++ b/core/io/file_access_buffered.cpp @@ -87,10 +87,8 @@ bool FileAccessBuffered::eof_reached() const { } uint8_t FileAccessBuffered::get_8() const { - if (!file.open) { - ERR_EXPLAIN("Can't get data, when file is not opened."); - ERR_FAIL_V(0); - } + + ERR_FAIL_COND_V_MSG(!file.open, 0, "Can't get data, when file is not opened."); uint8_t byte = 0; if (cache_data_left() >= 1) { @@ -104,10 +102,8 @@ uint8_t FileAccessBuffered::get_8() const { } int FileAccessBuffered::get_buffer(uint8_t *p_dest, int p_length) const { - if (!file.open) { - ERR_EXPLAIN("Can't get buffer, when file is not opened."); - ERR_FAIL_V(-1); - } + + ERR_FAIL_COND_V_MSG(!file.open, -1, "Can't get buffer, when file is not opened."); if (p_length > cache_size) { |