diff options
Diffstat (limited to 'drivers/unix')
| -rw-r--r-- | drivers/unix/file_access_unix.cpp | 20 | ||||
| -rw-r--r-- | drivers/unix/os_unix.cpp | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp index 3b15cf60f7..d28e0e70b8 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -53,7 +53,7 @@ #endif void FileAccessUnix::check_errors() const { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); if (feof(f)) { last_error = ERR_FILE_EOF; @@ -185,7 +185,7 @@ String FileAccessUnix::get_path_absolute() const { } void FileAccessUnix::seek(uint64_t p_position) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); last_error = OK; if (fseeko(f, p_position, SEEK_SET)) { @@ -194,7 +194,7 @@ void FileAccessUnix::seek(uint64_t p_position) { } void FileAccessUnix::seek_end(int64_t p_position) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); if (fseeko(f, p_position, SEEK_END)) { check_errors(); @@ -202,7 +202,7 @@ void FileAccessUnix::seek_end(int64_t p_position) { } uint64_t FileAccessUnix::get_position() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); + ERR_FAIL_NULL_V_MSG(f, 0, "File must be opened before use."); int64_t pos = ftello(f); if (pos < 0) { @@ -213,7 +213,7 @@ uint64_t FileAccessUnix::get_position() const { } uint64_t FileAccessUnix::get_length() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); + ERR_FAIL_NULL_V_MSG(f, 0, "File must be opened before use."); int64_t pos = ftello(f); ERR_FAIL_COND_V(pos < 0, 0); @@ -230,7 +230,7 @@ bool FileAccessUnix::eof_reached() const { } uint8_t FileAccessUnix::get_8() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); + ERR_FAIL_NULL_V_MSG(f, 0, "File must be opened before use."); uint8_t b; if (fread(&b, 1, 1, f) == 0) { check_errors(); @@ -241,7 +241,7 @@ uint8_t FileAccessUnix::get_8() const { uint64_t FileAccessUnix::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_MSG(!f, -1, "File must be opened before use."); + ERR_FAIL_NULL_V_MSG(f, -1, "File must be opened before use."); uint64_t read = fread(p_dst, 1, p_length, f); check_errors(); @@ -253,17 +253,17 @@ Error FileAccessUnix::get_error() const { } void FileAccessUnix::flush() { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); fflush(f); } void FileAccessUnix::store_8(uint8_t p_dest) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); ERR_FAIL_COND(fwrite(&p_dest, 1, 1, f) != 1); } void FileAccessUnix::store_buffer(const uint8_t *p_src, uint64_t p_length) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); ERR_FAIL_COND(!p_src && p_length > 0); ERR_FAIL_COND(fwrite(p_src, 1, p_length, f) != p_length); } diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 1ffacdf98d..4d9549c5a6 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -495,7 +495,7 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, St } FILE *f = popen(command.utf8().get_data(), "r"); - ERR_FAIL_COND_V_MSG(!f, ERR_CANT_OPEN, "Cannot create pipe from command: " + command); + ERR_FAIL_NULL_V_MSG(f, ERR_CANT_OPEN, "Cannot create pipe from command: " + command + "."); char buf[65535]; while (fgets(buf, 65535, f)) { if (p_pipe_mutex) { @@ -647,7 +647,7 @@ Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle } p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW); - ERR_FAIL_COND_V_MSG(!p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror())); + ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror())); if (r_resolved_path != nullptr) { *r_resolved_path = path; |