Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace format specifiers for all usages of ASSERT_MSG

Browse source
This commit is contained in:
Daniel Lim Wee Soong 2018-03-27 23:28:42 +08:00
parent 59b8a1dbc2
commit 968569aa61
20 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/common/chunk_file.h
View file

@ -198,7 +198,7 @@ public:
for (int i = 0; i < size; i++) {
DEBUG_ASSERT_MSG(
((u8*)data)[i] == (*ptr)[i],
"Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n",
"Savestate verification failure: {} ({:#X}) (at {}) != {} ({:#X}) (at {}).\n",
((u8*)data)[i], ((u8*)data)[i], &((u8*)data)[i], (*ptr)[i], (*ptr)[i],
&(*ptr)[i]);
}
@ -224,7 +224,7 @@ public:
for (int i = 0; i < size; i++) {
DEBUG_ASSERT_MSG(
((u8*)data)[i] == (*ptr)[i],
"Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n",
"Savestate verification failure: {} ({#:X}) (at {}) != {} ({:#X}) (at {}).\n",
((u8*)data)[i], ((u8*)data)[i], &((u8*)data)[i], (*ptr)[i], (*ptr)[i],
&(*ptr)[i]);
}
@ -486,8 +486,8 @@ public:
break;
case MODE_VERIFY:
DEBUG_ASSERT_MSG((x == (char*)*ptr),
"Savestate verification failure: \"%s\" != \"%s\" (at %p).\n",
x.c_str(), (char*)*ptr, ptr);
"Savestate verification failure: \"{}\" != \"{}\" (at {}).\n", x,
(char*)*ptr, ptr);
break;
}
(*ptr) += stringLen;
@ -508,8 +508,8 @@ public:
break;
case MODE_VERIFY:
DEBUG_ASSERT_MSG((x == (wchar_t*)*ptr),
"Savestate verification failure: \"%ls\" != \"%ls\" (at %p).\n",
x.c_str(), (wchar_t*)*ptr, ptr);
"Savestate verification failure: \"{}\" != \"{}\" (at {}).\n", x,
(wchar_t*)*ptr, ptr);
break;
}
(*ptr) += stringLen;

6
src/common/file_util.cpp
View file

@ -651,12 +651,12 @@ static const std::string GetUserDirectory(const std::string& envvar) {
else if (envvar == "XDG_CACHE_HOME")
subdirectory = DIR_SEP ".cache";
else
ASSERT_MSG(false, "Unknown XDG variable %s.", envvar.c_str());
ASSERT_MSG(false, "Unknown XDG variable {}.", envvar);
user_dir = GetHomeDirectory() + subdirectory;
}
ASSERT_MSG(!user_dir.empty(), "User directory %s musn’t be empty.", envvar.c_str());
ASSERT_MSG(user_dir[0] == '/', "User directory %s must be absolute.", envvar.c_str());
ASSERT_MSG(!user_dir.empty(), "User directory {} musn’t be empty.", envvar);
ASSERT_MSG(user_dir[0] == '/', "User directory {} must be absolute.", envvar);
return user_dir;
}