diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-17 13:31:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-17 13:31:08 +0200 |
| commit | de4aabe89b7b68677f145f21c956183bbc92f686 (patch) | |
| tree | 20b2e819d599d6d1bd459bb51880c31e97cfe825 /core/io/file_access_encrypted.cpp | |
| parent | 40640a01dc90be00e55e4eef3c7800401ef63b18 (diff) | |
| parent | 71d71d55b5c0d6da4d1555823ac432bf0b33389a (diff) | |
Merge pull request #31244 from Unholydeath/BB_ChangeErrorMacros
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in 'core/' and 'editor/'
Diffstat (limited to 'core/io/file_access_encrypted.cpp')
| -rw-r--r-- | core/io/file_access_encrypted.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp index ccee6aeb15..1452c61d1a 100644 --- a/core/io/file_access_encrypted.cpp +++ b/core/io/file_access_encrypted.cpp @@ -94,8 +94,7 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8 unsigned char hash[16]; ERR_FAIL_COND_V(CryptoCore::md5(data.ptr(), data.size(), hash) != OK, ERR_BUG); - ERR_EXPLAIN("The MD5 sum of the decrypted file does not match the expected value. It could be that the file is corrupt, or that the provided decryption key is invalid."); - ERR_FAIL_COND_V(String::md5(hash) != String::md5(md5d), ERR_FILE_CORRUPT); + ERR_FAIL_COND_V_MSG(String::md5(hash) != String::md5(md5d), ERR_FILE_CORRUPT, "The MD5 sum of the decrypted file does not match the expected value. It could be that the file is corrupt, or that the provided decryption key is invalid."); file = p_base; } @@ -298,7 +297,7 @@ uint32_t FileAccessEncrypted::_get_unix_permissions(const String &p_file) { } Error FileAccessEncrypted::_set_unix_permissions(const String &p_file, uint32_t p_permissions) { - ERR_PRINT("Setting UNIX permissions on encrypted files is not implemented yet"); + ERR_PRINT("Setting UNIX permissions on encrypted files is not implemented yet."); return ERR_UNAVAILABLE; } |