From 23af379bfb8c151a84657741c8c4c8a893e13f13 Mon Sep 17 00:00:00 2001 From: TapTap Date: Tue, 21 Jul 2026 14:16:09 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20address=20review=20findings=20=E2=80=94?= =?UTF-8?q?=20unused=20var,=20constness,=20format=20specifiers,=20bounds?= =?UTF-8?q?=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/scanner.c | 2 +- src/shared/data.c | 2 +- src/shared/protocol.c | 4 ++-- src/shared/utils.c | 7 +++---- src/shared/utils.h | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/client/scanner.c b/src/client/scanner.c index 109ffa0..c4708a5 100644 --- a/src/client/scanner.c +++ b/src/client/scanner.c @@ -159,7 +159,7 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) { char* cur_path = path_cat(scanner->current_path, entry->d_name); struct stat stats; - if (stat(cur_path, &stats) != 0) { + if (lstat(cur_path, &stats) != 0) { free(cur_path); continue; } diff --git a/src/shared/data.c b/src/shared/data.c index e0e3156..82e6198 100644 --- a/src/shared/data.c +++ b/src/shared/data.c @@ -1,6 +1,6 @@ #include "data.h" #include "log.h" -#include "stdlib.h" +#include Data* data_create_empty(size_t data_size) { /* malloc(0) is UB; allocate at least 1 byte but preserve requested size */ diff --git a/src/shared/protocol.c b/src/shared/protocol.c index c3dcb74..4146078 100644 --- a/src/shared/protocol.c +++ b/src/shared/protocol.c @@ -178,7 +178,7 @@ bool send_data(int file_descriptor, const Data* data) { return false; if (!send_n_data(file_descriptor, data->data, data_size)) return false; - log_message(LOG_LEVEL_DEBUG, "Send %lld data", data_size); + log_message(LOG_LEVEL_DEBUG, "Send %llu data", data_size); return true; } @@ -193,7 +193,7 @@ Data* receive_data(int file_descriptor) { free(data); return NULL; } - log_message(LOG_LEVEL_DEBUG, "Received %lld data", size); + log_message(LOG_LEVEL_DEBUG, "Received %llu data", size); return data_create(data, (size_t)size); } diff --git a/src/shared/utils.c b/src/shared/utils.c index 528191b..4848052 100644 --- a/src/shared/utils.c +++ b/src/shared/utils.c @@ -158,18 +158,17 @@ void delete_extras(const char* dest_root, ArrayList* manifest) { delete_extras_walk(dest_root, "", manifest); } -char* path_cat(const char* path1, char* path2) { +char* path_cat(const char* path1, const char* path2) { if (path1 == NULL || *path1 == '\0') return str_dup(path2); if (path2 == NULL || *path2 == '\0') return str_dup(path1); int path1_len = strlen(path1); int path2_len = strlen(path2); - char* path2_pointer = path2; if (path1[path1_len - 1] == '/') path1_len -= 1; if (path2[0] == '/') { - path2_pointer += 1; + path2++; path2_len -= 1; } char* new_path = malloc(path1_len + path2_len + 2); @@ -177,7 +176,7 @@ char* path_cat(const char* path1, char* path2) { return NULL; memcpy(new_path, path1, path1_len); new_path[path1_len] = '/'; - memcpy(new_path + path1_len + 1, path2_pointer, path2_len); + memcpy(new_path + path1_len + 1, path2, path2_len); new_path[path1_len + path2_len + 1] = '\0'; return new_path; } diff --git a/src/shared/utils.h b/src/shared/utils.h index 13cd999..1cc8a6c 100644 --- a/src/shared/utils.h +++ b/src/shared/utils.h @@ -6,7 +6,7 @@ bool mkdir_r(const char* path); char* str_dup(const char* string); -char* path_cat(const char* path1, char* path2); +char* path_cat(const char* path1, const char* path2); bool glob_match(const char* pattern, const char* str); void delete_extras(const char* dest_root, ArrayList* manifest);