diff options
| author | Aldrik Ramaekers <aldrikboy@gmail.com> | 2024-03-09 14:57:04 +0100 |
|---|---|---|
| committer | Aldrik Ramaekers <aldrikboy@gmail.com> | 2024-03-09 14:57:04 +0100 |
| commit | 331882200dbad630d7722b4f05e23d69edbc6a6a (patch) | |
| tree | bb2e7c116a0ac6ec20160fe39ed45c7aa4bdeace | |
| parent | 4d3fea5faf60795bc90ceb51ccfa693dd6ddf5c2 (diff) | |
remove unnecessary goto
| -rw-r--r-- | build_linux.sh | 2 | ||||
| -rw-r--r-- | src/search.cpp | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/build_linux.sh b/build_linux.sh index 2fa06ad..f8c299e 100644 --- a/build_linux.sh +++ b/build_linux.sh @@ -5,7 +5,7 @@ FLAGS="-g3 -Wall" if [[ $* == *-release* ]]; then OUT_DIR="bin/release" - FLAGS="-g3 -O3" + FLAGS="-O3" fi mkdir -p $OUT_DIR diff --git a/src/search.cpp b/src/search.cpp index ed1efa1..96f8c32 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -311,8 +311,7 @@ static void *_ts_search_thread(void *args) ts_search_result *new_result = (ts_search_result *)args; if (new_result->search_text == nullptr) goto finish_early; -keep_going:; - while (new_result->file_list_read_cursor < new_result->files.length) + while (new_result->file_list_read_cursor < new_result->files.length || !new_result->done_finding_files) { ts_thread_sleep(10); if (new_result->cancel_search) @@ -345,10 +344,7 @@ keep_going:; free(content.content); } - if (!new_result->done_finding_files) - goto keep_going; - -finish_early:; +finish_early: ts_mutex_lock(&new_result->files.mutex); new_result->completed_match_threads++; ts_mutex_unlock(&new_result->files.mutex); |
