summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-08-27 21:45:22 +0200
committerGitHub <noreply@github.com>2018-08-27 21:45:22 +0200
commit887a9c5c2936371404dd94f3fa1d00aadee0102d (patch)
tree8f9dd696bab4241569c8b1ef4cf08809cf31a454 /src
parentMerge pull request #1176 from lioncash/info (diff)
parenthex_util: Replace logic_errors with LOG_CRITICAL (diff)
downloadyuzu-887a9c5c2936371404dd94f3fa1d00aadee0102d.tar
yuzu-887a9c5c2936371404dd94f3fa1d00aadee0102d.tar.gz
yuzu-887a9c5c2936371404dd94f3fa1d00aadee0102d.tar.bz2
yuzu-887a9c5c2936371404dd94f3fa1d00aadee0102d.tar.lz
yuzu-887a9c5c2936371404dd94f3fa1d00aadee0102d.tar.xz
yuzu-887a9c5c2936371404dd94f3fa1d00aadee0102d.tar.zst
yuzu-887a9c5c2936371404dd94f3fa1d00aadee0102d.zip
Diffstat (limited to '')
-rw-r--r--src/common/hex_util.cpp22
1 files changed, 17 insertions, 5 deletions
diff --git a/src/common/hex_util.cpp b/src/common/hex_util.cpp
index 609144def..8e0a9e46f 100644
--- a/src/common/hex_util.cpp
+++ b/src/common/hex_util.cpp
@@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include "common/hex_util.h"
+#include "common/logging/log.h"
namespace Common {
@@ -13,18 +14,29 @@ u8 ToHexNibble(char c1) {
return c1 - 87;
if (c1 >= 48 && c1 <= 57)
return c1 - 48;
- throw std::logic_error("Invalid hex digit");
+ LOG_ERROR(Common, "Invalid hex digit: 0x{:02X}", c1);
+ return 0;
}
std::array<u8, 16> operator""_array16(const char* str, size_t len) {
- if (len != 32)
- throw std::logic_error("Not of correct size.");
+ if (len != 32) {
+ LOG_ERROR(Common,
+ "Attempting to parse string to array that is not of correct size (expected=32, "
+ "actual={}).",
+ len);
+ return {};
+ }
return HexStringToArray<16>(str);
}
std::array<u8, 32> operator""_array32(const char* str, size_t len) {
- if (len != 64)
- throw std::logic_error("Not of correct size.");
+ if (len != 64) {
+ LOG_ERROR(Common,
+ "Attempting to parse string to array that is not of correct size (expected=64, "
+ "actual={}).",
+ len);
+ return {};
+ }
return HexStringToArray<32>(str);
}