From af813a0929f88800bb368646236390a154fd199b Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 29 Aug 2024 10:41:07 +0200 Subject: [PATCH] [cmake,clang-tidy] do not use explicit .clang-tidy if not explicitly added the nearest .clang-tidy file to the compiled source is used. --- channels/tsmf/client/tsmf_media.c | 2 +- cmake/ClangTidy.cmake | 2 +- libfreerdp/cache/persistent.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c index 0fbe2c475..40e69520e 100644 --- a/channels/tsmf/client/tsmf_media.c +++ b/channels/tsmf/client/tsmf_media.c @@ -52,7 +52,7 @@ #define AUDIO_TOLERANCE 10000000LL /* 1 second = 10,000,000 100ns units*/ -#define VIDEO_ADJUST_MAX 10ULL * 1000ULL * 1000ULL +#define VIDEO_ADJUST_MAX (10ULL * 1000ULL * 1000ULL) #define MAX_ACK_TIME 666667 diff --git a/cmake/ClangTidy.cmake b/cmake/ClangTidy.cmake index b596f78fc..4298a043c 100644 --- a/cmake/ClangTidy.cmake +++ b/cmake/ClangTidy.cmake @@ -4,7 +4,7 @@ if (BUILD_WITH_CLANG_TIDY) include(ClangDetectTool) clang_detect_tool(CLANG_TIDY_EXE clang-tidy REQUIRED) - set(CLANG_TIDY_COMMAND "${CLANG_TIDY_EXE}" --config-file=${CMAKE_SOURCE_DIR}/.clang-tidy) + set(CLANG_TIDY_COMMAND "${CLANG_TIDY_EXE}") set(CMAKE_C_CLANG_TIDY "${CLANG_TIDY_COMMAND}" --extra-arg=-std=gnu11) set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND}" --extra-arg=-std=gnu++17) diff --git a/libfreerdp/cache/persistent.c b/libfreerdp/cache/persistent.c index 47c47867d..36133fc98 100644 --- a/libfreerdp/cache/persistent.c +++ b/libfreerdp/cache/persistent.c @@ -207,7 +207,7 @@ static int persistent_cache_read_v3(rdpPersistentCache* persistent) if (fread((void*)&entry, sizeof(entry), 1, persistent->fp) != 1) break; - if (fseek(persistent->fp, (4ULL * entry.width * entry.height), SEEK_CUR) != 0) + if (_fseeki64(persistent->fp, (4LL * entry.width * entry.height), SEEK_CUR) != 0) break; persistent->count++;