From 985a70824d41e10a23a8c4568afed6c052f6b101 Mon Sep 17 00:00:00 2001 From: Ozan Tezcan Date: Wed, 7 Dec 2022 00:55:43 +0300 Subject: [PATCH] Fix clang-tidy warnings (#101) Fix clang-tidy warnings --- .github/workflows/.ubuntu.yml | 2 +- buffer/CMakeLists.txt | 2 +- condition/CMakeLists.txt | 2 +- crc32/CMakeLists.txt | 2 +- linked-list/CMakeLists.txt | 2 +- logger/CMakeLists.txt | 2 +- logger/sc_log.c | 2 +- map/CMakeLists.txt | 2 +- memory-map/CMakeLists.txt | 2 +- mutex/CMakeLists.txt | 2 +- signal/CMakeLists.txt | 2 +- signal/sc_signal.c | 2 +- string/CMakeLists.txt | 2 +- thread/CMakeLists.txt | 2 +- time/CMakeLists.txt | 2 +- timer/CMakeLists.txt | 2 +- timer/sc_timer.c | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/.ubuntu.yml b/.github/workflows/.ubuntu.yml index 3e7a9c5..3176e5e 100644 --- a/.github/workflows/.ubuntu.yml +++ b/.github/workflows/.ubuntu.yml @@ -8,7 +8,7 @@ on: - master jobs: ubuntu: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 name: Build on Ubuntu strategy: diff --git a/buffer/CMakeLists.txt b/buffer/CMakeLists.txt index 3c439b8..dba2981 100644 --- a/buffer/CMakeLists.txt +++ b/buffer/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-easily-swappable-parameters*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/condition/CMakeLists.txt b/condition/CMakeLists.txt index e2f6e8f..92981f7 100644 --- a/condition/CMakeLists.txt +++ b/condition/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-reserved-identifier*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/crc32/CMakeLists.txt b/crc32/CMakeLists.txt index c4074e6..df1158c 100644 --- a/crc32/CMakeLists.txt +++ b/crc32/CMakeLists.txt @@ -32,7 +32,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-implicit-widening-of-multiplication-result*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/linked-list/CMakeLists.txt b/linked-list/CMakeLists.txt index 6f903a0..6cee86c 100644 --- a/linked-list/CMakeLists.txt +++ b/linked-list/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-easily-swappable-parameters*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/logger/CMakeLists.txt b/logger/CMakeLists.txt index b498d2a..94a3ce0 100644 --- a/logger/CMakeLists.txt +++ b/logger/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-easily-swappable-parameters*,-bugprone-reserved-identifier*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/logger/sc_log.c b/logger/sc_log.c index 5d9dd43..df60a24 100644 --- a/logger/sc_log.c +++ b/logger/sc_log.c @@ -370,7 +370,7 @@ static int sc_log_file(enum sc_log_level level, const char *fmt, va_list va) sc_log.file_size += size; - if (sc_log.file_size > SC_LOG_FILE_SIZE) { + if (sc_log.file_size > (size_t) SC_LOG_FILE_SIZE) { fclose(sc_log.fp); (void) rename(sc_log.current_file, sc_log.prev_file); diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt index bbcdc4d..169aff5 100644 --- a/map/CMakeLists.txt +++ b/map/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-easily-swappable-parameters*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/memory-map/CMakeLists.txt b/memory-map/CMakeLists.txt index 8595d9d..e68c609 100644 --- a/memory-map/CMakeLists.txt +++ b/memory-map/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-easily-swappable-parameters*,-bugprone-reserved-identifier*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/mutex/CMakeLists.txt b/mutex/CMakeLists.txt index de74304..f88edfb 100644 --- a/mutex/CMakeLists.txt +++ b/mutex/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-reserved-identifier*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/signal/CMakeLists.txt b/signal/CMakeLists.txt index 525e6d5..5d0445a 100644 --- a/signal/CMakeLists.txt +++ b/signal/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-reserved-identifier*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/signal/sc_signal.c b/signal/sc_signal.c index 6408dbd..87c78d8 100644 --- a/signal/sc_signal.c +++ b/signal/sc_signal.c @@ -521,6 +521,6 @@ void sc_signal_log(int fd, char *buf, size_t sz, char *fmt, ...) wr = sc_signal_vsnprintf(buf, sz, fmt, args); va_end(args); - rc = write(fd, buf, (size_t) wr); + rc = (int) write(fd, buf, (size_t) wr); (void) rc; } diff --git a/string/CMakeLists.txt b/string/CMakeLists.txt index 649053e..fb93b2d 100644 --- a/string/CMakeLists.txt +++ b/string/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-easily-swappable-parameters*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/thread/CMakeLists.txt b/thread/CMakeLists.txt index ac0a79c..388d195 100644 --- a/thread/CMakeLists.txt +++ b/thread/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-easily-swappable-parameters*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/time/CMakeLists.txt b/time/CMakeLists.txt index c277ae5..7092252 100644 --- a/time/CMakeLists.txt +++ b/time/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-reserved-identifier*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/timer/CMakeLists.txt b/timer/CMakeLists.txt index 07d78e5..a5bb126 100644 --- a/timer/CMakeLists.txt +++ b/timer/CMakeLists.txt @@ -31,7 +31,7 @@ if (SC_BUILD_TEST) set(CMAKE_C_CLANG_TIDY clang-tidy; -line-filter=[{"name":"${PROJECT_NAME}.h"},{"name":"${PROJECT_NAME}.c"}]; - -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*; + -checks=clang-analyzer-*,misc-*,portability-*,bugprone-*,-bugprone-easily-swappable-parameters*,-bugprone-implicit-widening-of-multiplication-result*; -warnings-as-errors=clang-analyzer-*,misc-*,portability-*,bugprone-*;) endif () diff --git a/timer/sc_timer.c b/timer/sc_timer.c index f89d15f..b519db9 100644 --- a/timer/sc_timer.c +++ b/timer/sc_timer.c @@ -153,7 +153,7 @@ void sc_timer_cancel(struct sc_timer *t, uint64_t *id) return; } - pos = (((uint32_t) *id) * t->wheel) + (*id >> 32u); + pos = (uint64_t) (((uint32_t) *id) * t->wheel) + (*id >> 32u); t->list[pos].timeout = SC_TIMER_INVALID; *id = SC_TIMER_INVALID;