summaryrefslogtreecommitdiffstats
path: root/core/io/packed_data_container.cpp
diff options
context:
space:
mode:
authorA Thousand Ships <96648715+AThousandShips@users.noreply.github.com>2023-09-09 16:11:33 +0200
committerA Thousand Ships <96648715+AThousandShips@users.noreply.github.com>2023-09-11 19:45:49 +0200
commit893f889d74b35bb7330c3ff3d0187042770a4490 (patch)
treeb1435faf6380670ffc4a878d0cdcb29a0527f5a7 /core/io/packed_data_container.cpp
parent221884e6bc260c38f16422081b7d4efd49a71375 (diff)
downloadredot-engine-893f889d74b35bb7330c3ff3d0187042770a4490.tar.gz
[Core] Replace `ERR_FAIL_COND` with `ERR_FAIL_NULL` where applicable
Diffstat (limited to 'core/io/packed_data_container.cpp')
-rw-r--r--core/io/packed_data_container.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/io/packed_data_container.cpp b/core/io/packed_data_container.cpp
index ce4edb18fe..11b0c69774 100644
--- a/core/io/packed_data_container.cpp
+++ b/core/io/packed_data_container.cpp
@@ -125,7 +125,7 @@ Variant PackedDataContainer::_get_at_ofs(uint32_t p_ofs, const uint8_t *p_buf, b
uint32_t PackedDataContainer::_type_at_ofs(uint32_t p_ofs) const {
ERR_FAIL_COND_V(p_ofs + 4 > (uint32_t)data.size(), 0);
const uint8_t *rd = data.ptr();
- ERR_FAIL_COND_V(!rd, 0);
+ ERR_FAIL_NULL_V(rd, 0);
const uint8_t *r = &rd[p_ofs];
uint32_t type = decode_uint32(r);
@@ -135,7 +135,7 @@ uint32_t PackedDataContainer::_type_at_ofs(uint32_t p_ofs) const {
int PackedDataContainer::_size(uint32_t p_ofs) const {
ERR_FAIL_COND_V(p_ofs + 4 > (uint32_t)data.size(), 0);
const uint8_t *rd = data.ptr();
- ERR_FAIL_COND_V(!rd, 0);
+ ERR_FAIL_NULL_V(rd, 0);
const uint8_t *r = &rd[p_ofs];
uint32_t type = decode_uint32(r);
@@ -156,7 +156,7 @@ Variant PackedDataContainer::_key_at_ofs(uint32_t p_ofs, const Variant &p_key, b
const uint8_t *rd = data.ptr();
if (!rd) {
err = true;
- ERR_FAIL_COND_V(!rd, Variant());
+ ERR_FAIL_NULL_V(rd, Variant());
}
const uint8_t *r = &rd[p_ofs];
uint32_t type = decode_uint32(r);