h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-21 11:31:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix some compile warnings

Browse Source
This commit is contained in:
ridiculousfish
2019-01-10 20:59:47 -08:00
parent 92d3f5f548
commit a333c2f01d
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common.cpp
View File

@@ -2166,9 +2166,10 @@ __attribute__((noinline)) void debug_thread_error(void) {
}
void set_main_thread() {
// Just call is_main_thread() once to force increment of thread_id
// We store the result as `volatile` to guarantee the function call is not optimized away
volatile bool _x = is_main_thread();
// Just call is_main_thread() once to force increment of thread_id.
bool x = is_main_thread();
assert(x && "set_main_thread should be main thread");
(void)x;
}
void configure_thread_assertions_for_testing() { thread_asserts_cfg_for_testing = true; }

14
src/fish_tests.cpp
View File

@@ -4420,15 +4420,15 @@ static void test_pcre2_escape() {
// all the following are intended to be ultimately matched literally - even if they don't look
// like that's the intent - so we escape them.
const wchar_t * tests[][2] = {
L".ext", L"\\.ext",
L"{word}", L"\\{word\\}",
L"hola-mundo", L"hola\\-mundo",
L"$17.42 is your total?", L"\\$17\\.42 is your total\\?",
L"not really escaped\\?", L"not really escaped\\\\\\?",
const wchar_t * const tests[][2] = {
{L".ext", L"\\.ext"},
{L"{word}", L"\\{word\\}"},
{L"hola-mundo", L"hola\\-mundo"},
{L"$17.42 is your total?", L"\\$17\\.42 is your total\\?"},
{L"not really escaped\\?", L"not really escaped\\\\\\?"},
};
for (auto &test : tests) {
for (const auto &test : tests) {
auto escaped = escape_string(test[0], 0, STRING_STYLE_REGEX);
if (escaped != test[1]) {
err(L"pcre2_escape error: pcre2_escape(%ls) -> %ls, expected %ls", test[0], escaped.c_str(), test[1]);