mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-09-30 14:57:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Finish GetValidSizeAsUtf8String

Browse Source
This commit is contained in:
XorTroll 2020-12-22 18:52:08 +01:00
parent ba4263d859
commit 9b08454557
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libraries/libstratosphere/source/diag/detail/diag_detail_string.cpp
View File

@ -17,25 +17,6 @@
namespace ams::diag::detail {
namespace {
inline ssize_t A(size_t len, size_t tmp_len) {
if (tmp_len < len) {
return len - tmp_len;
}
AMS_ABORT_UNLESS(tmp_len == len);
return -1;
}
inline ssize_t B(size_t len, size_t val, size_t tmp_len) {
if (tmp_len == val) {
return len;
}
return 1;
}
}
void PrintDebugString(const char *str, size_t len) {
AMS_ASSERT(str && len);
svc::OutputDebugString(str, len);
@ -64,14 +45,20 @@ namespace ams::diag::detail {
if (tmp_len < 1) {
return len;
}
return B(len, 1, tmp_len);
if (tmp_len == 1) {
return len;
}
return 1;
}
if ((some_c & 0xE0) == 0xC0) {
tmp_len = static_cast<size_t>(str_nul_end - (str_end + 1));
if (tmp_len >= 2) {
return B(len, 2, tmp_len);
if (tmp_len == 2) {
return len;
}
return 1;
}
}
else {
@ -81,17 +68,31 @@ namespace ams::diag::detail {
}
tmp_len = static_cast<size_t>(str_nul_end - (str_end + 1));
if (tmp_len < 4) {
return A(len, tmp_len);
if (tmp_len < len) {
return len - tmp_len;
}
AMS_ABORT_UNLESS(tmp_len == len);
return -1;
}
return B(len, 4, tmp_len);
if (tmp_len == 4) {
return len;
}
return 1;
}
tmp_len = static_cast<size_t>(str_nul_end - (str_end + 1));
if (tmp_len >= 3) {
return B(len, 3, tmp_len);
if (tmp_len == 3) {
return len;
}
return 1;
}
}
return A(len, tmp_len);
if (tmp_len < len) {
return len - tmp_len;
}
AMS_ABORT_UNLESS(tmp_len == len);
return -1;
}
}