summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-08-23 20:44:41 +0200
committerZach Hilman <zachhilman@gmail.com>2018-08-23 20:44:51 +0200
commit06487c2c8dc29f9393338761dbe107be865e4808 (patch)
tree45f2886b8f6171522ac0e994adb1af997aa240a5 /src/common
parentMerge pull request #1160 from bunnei/surface-reserve (diff)
downloadyuzu-06487c2c8dc29f9393338761dbe107be865e4808.tar
yuzu-06487c2c8dc29f9393338761dbe107be865e4808.tar.gz
yuzu-06487c2c8dc29f9393338761dbe107be865e4808.tar.bz2
yuzu-06487c2c8dc29f9393338761dbe107be865e4808.tar.lz
yuzu-06487c2c8dc29f9393338761dbe107be865e4808.tar.xz
yuzu-06487c2c8dc29f9393338761dbe107be865e4808.tar.zst
yuzu-06487c2c8dc29f9393338761dbe107be865e4808.zip
Diffstat (limited to 'src/common')
-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);
}