From 7d8f5938442ec0e0129631c627948ecedc5c9d09 Mon Sep 17 00:00:00 2001 From: TapTap Date: Wed, 29 Jul 2026 19:32:13 +0200 Subject: [PATCH] style: apply clang-format across all source files --- src/client/client_cli.c | 27 ++++++++++++++-------- src/client/client_send.c | 5 ++--- src/client/scanner.c | 28 +++++++++++------------ src/client/scanner.h | 25 ++++++++++----------- src/shared/config.c | 1 - src/shared/delta.c | 4 ++-- src/shared/file.c | 3 ++- tests/test_config.c | 12 +++++----- tests/test_scanner.c | 48 ++++++++++++++++++++-------------------- 9 files changed, 80 insertions(+), 73 deletions(-) diff --git a/src/client/client_cli.c b/src/client/client_cli.c index 3abfa83..de1fc3c 100644 --- a/src/client/client_cli.c +++ b/src/client/client_cli.c @@ -311,7 +311,8 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar config->itemize_changes = true; } else if (strcmp(argv[i], "--out-format") == 0 && i + 1 < argc) { char* dup = str_dup(argv[++i]); - if (!dup) return -1; + if (!dup) + return -1; free(config->out_format); config->out_format = dup; } else if (strcmp(argv[i], "--info") == 0 && i + 1 < argc) { @@ -345,11 +346,13 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar if (!config->filters) config->filters = array_list_create(free); char* dup = str_dup(argv[++i]); - if (!dup) return -1; + if (!dup) + return -1; array_list_add(config->filters, dup); } else if (strcmp(argv[i], "--files-from") == 0 && i + 1 < argc) { char* dup = str_dup(argv[++i]); - if (!dup) return -1; + if (!dup) + return -1; free(config->files_from); config->files_from = dup; } else if (strcmp(argv[i], "--cvs-exclude") == 0) { @@ -361,7 +364,8 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar } else if (strcmp(argv[i], "-e") == 0 || strcmp(argv[i], "--rsh") == 0) { if (i + 1 < argc) { char* dup = str_dup(argv[++i]); - if (!dup) return -1; + if (!dup) + return -1; free(config->rsh_command); config->rsh_command = dup; } else { @@ -370,27 +374,32 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar } } else if (strcmp(argv[i], "--rsync-path") == 0 && i + 1 < argc) { char* dup = str_dup(argv[++i]); - if (!dup) return -1; + if (!dup) + return -1; free(config->rsync_path); config->rsync_path = dup; } else if (strcmp(argv[i], "--temp-dir") == 0 && i + 1 < argc) { char* dup = str_dup(argv[++i]); - if (!dup) return -1; + if (!dup) + return -1; free(config->temp_dir); config->temp_dir = dup; } else if (strcmp(argv[i], "--compare-dest") == 0 && i + 1 < argc) { char* dup = str_dup(argv[++i]); - if (!dup) return -1; + if (!dup) + return -1; free(config->compare_dest); config->compare_dest = dup; } else if (strcmp(argv[i], "--copy-dest") == 0 && i + 1 < argc) { char* dup = str_dup(argv[++i]); - if (!dup) return -1; + if (!dup) + return -1; free(config->copy_dest); config->copy_dest = dup; } else if (strcmp(argv[i], "--link-dest") == 0 && i + 1 < argc) { char* dup = str_dup(argv[++i]); - if (!dup) return -1; + if (!dup) + return -1; free(config->link_dest); config->link_dest = dup; } else if (argv[i][0] == '-') { diff --git a/src/client/client_send.c b/src/client/client_send.c index 3ef2cd9..d295a82 100644 --- a/src/client/client_send.c +++ b/src/client/client_send.c @@ -339,9 +339,8 @@ static int scan_directory_multithreaded(void* pipeline_context) { context->config->send_directory, context->config->use_metadata, context->config->chunk_size, context->config->exclude_patterns, context->config->exclude_count, context->config->include_patterns, context->config->include_count, context->config->max_size, - context->config->min_size, context->config->max_depth, 4, - context->config->follow_symlinks, context->config->copy_links, - context->config->safe_links, context->config->copy_unsafe_links); + context->config->min_size, context->config->max_depth, 4, context->config->follow_symlinks, + context->config->copy_links, context->config->safe_links, context->config->copy_unsafe_links); Chunk* current_chunk; while ((current_chunk = parallel_scanner_next(scanner)) != NULL) { diff --git a/src/client/scanner.c b/src/client/scanner.c index e696503..0bcd851 100644 --- a/src/client/scanner.c +++ b/src/client/scanner.c @@ -35,12 +35,12 @@ static DirEntry* dir_entry_create(const char* path, int depth) { } DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_metadata, - unsigned long long chunk_size, char** exclude_patterns, - int exclude_count, char** include_patterns, - int include_count, unsigned long long max_size, - unsigned long long min_size, int max_depth, - bool follow_symlinks, bool copy_links, - bool safe_links, bool copy_unsafe_links) { + unsigned long long chunk_size, char** exclude_patterns, + int exclude_count, char** include_patterns, + int include_count, unsigned long long max_size, + unsigned long long min_size, int max_depth, + bool follow_symlinks, bool copy_links, bool safe_links, + bool copy_unsafe_links) { DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner)); if (scanner == NULL) return NULL; @@ -145,7 +145,8 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) { } is_symlink = S_ISLNK(lstats.st_mode); - if (is_symlink && !scanner->follow_symlinks && !scanner->copy_links && !scanner->safe_links && !scanner->copy_unsafe_links) { + if (is_symlink && !scanner->follow_symlinks && !scanner->copy_links && !scanner->safe_links && + !scanner->copy_unsafe_links) { free(cur_path); continue; } @@ -306,13 +307,12 @@ static int parallel_worker_thread(void* arg) { } ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata, - unsigned long long chunk_size, char** exclude_patterns, - int exclude_count, char** include_patterns, - int include_count, unsigned long long max_size, - unsigned long long min_size, int max_depth, - int num_threads, - bool follow_symlinks, bool copy_links, - bool safe_links, bool copy_unsafe_links) { + unsigned long long chunk_size, char** exclude_patterns, + int exclude_count, char** include_patterns, + int include_count, unsigned long long max_size, + unsigned long long min_size, int max_depth, + int num_threads, bool follow_symlinks, bool copy_links, + bool safe_links, bool copy_unsafe_links) { ParallelScanner* ps = calloc(1, sizeof(ParallelScanner)); if (!ps) return NULL; diff --git a/src/client/scanner.h b/src/client/scanner.h index 17bcf8f..f3e0f0c 100644 --- a/src/client/scanner.h +++ b/src/client/scanner.h @@ -40,23 +40,22 @@ typedef struct { } ParallelScanner; DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_metadata, - unsigned long long chunk_size, char** exclude_patterns, - int exclude_count, char** include_patterns, - int include_count, unsigned long long max_size, - unsigned long long min_size, int max_depth, - bool follow_symlinks, bool copy_links, - bool safe_links, bool copy_unsafe_links); + unsigned long long chunk_size, char** exclude_patterns, + int exclude_count, char** include_patterns, + int include_count, unsigned long long max_size, + unsigned long long min_size, int max_depth, + bool follow_symlinks, bool copy_links, bool safe_links, + bool copy_unsafe_links); Chunk* directory_scanner_next(DirectoryScanner* scanner); void directory_scanner_destroy(DirectoryScanner* scanner); ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata, - unsigned long long chunk_size, char** exclude_patterns, - int exclude_count, char** include_patterns, - int include_count, unsigned long long max_size, - unsigned long long min_size, int max_depth, - int num_threads, - bool follow_symlinks, bool copy_links, - bool safe_links, bool copy_unsafe_links); + unsigned long long chunk_size, char** exclude_patterns, + int exclude_count, char** include_patterns, + int include_count, unsigned long long max_size, + unsigned long long min_size, int max_depth, + int num_threads, bool follow_symlinks, bool copy_links, + bool safe_links, bool copy_unsafe_links); Chunk* parallel_scanner_next(ParallelScanner* scanner); void parallel_scanner_destroy(ParallelScanner* scanner); diff --git a/src/shared/config.c b/src/shared/config.c index f3bae94..e31df05 100644 --- a/src/shared/config.c +++ b/src/shared/config.c @@ -89,7 +89,6 @@ Config* config_create(void) { config->compare_dest = NULL; config->copy_dest = NULL; config->link_dest = NULL; ->>>>>>> origin/fix/rsync-parity-all return config; } diff --git a/src/shared/delta.c b/src/shared/delta.c index 48a3f97..0305fdc 100644 --- a/src/shared/delta.c +++ b/src/shared/delta.c @@ -9,8 +9,8 @@ #include /* Maximum number of blocks/instructions allowed from the wire to prevent OOM */ -#define MAX_DELTA_BLOCKS (1024U * 1024U) /* 1M signature blocks */ -#define MAX_DELTA_INSTRUCTIONS (1024U * 1024U) /* 1M delta instructions */ +#define MAX_DELTA_BLOCKS (1024U * 1024U) /* 1M signature blocks */ +#define MAX_DELTA_INSTRUCTIONS (1024U * 1024U) /* 1M delta instructions */ uint32_t delta_adler32(const void* data, uint32_t len) { const uint8_t* p = (const uint8_t*)data; diff --git a/src/shared/file.c b/src/shared/file.c index 43b97c0..62082ff 100644 --- a/src/shared/file.c +++ b/src/shared/file.c @@ -183,7 +183,8 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con size_t root_len = strlen(resolved_root); if (strncmp(resolved_dir, resolved_root, root_len) != 0 || (resolved_dir[root_len] != '\0' && resolved_dir[root_len] != '/')) { - log_message(LOG_LEVEL_ERROR, "Path escape detected: %s is outside %s", disk_path, root_directory); + log_message(LOG_LEVEL_ERROR, "Path escape detected: %s is outside %s", disk_path, + root_directory); free(resolved_dir); free(resolved_root); free(disk_path); diff --git a/tests/test_config.c b/tests/test_config.c index 9166457..7578d38 100644 --- a/tests/test_config.c +++ b/tests/test_config.c @@ -48,8 +48,8 @@ static void test_config_lifecycle() { } static void test_config_ssh_dest() { - Config* cfg = make_config("1.0", "/src", "user@host:/dst", true, false, false, false, false, 1, - false, 0); + Config* cfg = + make_config("1.0", "/src", "user@host:/dst", true, false, false, false, false, 1, false, 0); EXPECT_NOT_NULL(cfg); EXPECT_EQ_INT(cfg->transport, TRANSPORT_TCP); EXPECT_NULL(cfg->ssh_destination); @@ -63,8 +63,8 @@ static void test_config_ssh_dest() { } static void test_config_ssh_dest_local_path() { - Config* cfg = make_config("1.0", "/src", "/local/path", true, false, false, false, false, 1, - false, 0); + Config* cfg = + make_config("1.0", "/src", "/local/path", true, false, false, false, false, 1, false, 0); config_parse_ssh_dest(cfg); EXPECT_EQ_INT(cfg->transport, TRANSPORT_TCP); EXPECT_NULL(cfg->ssh_destination); @@ -73,8 +73,8 @@ static void test_config_ssh_dest_local_path() { } static void test_config_ssh_dest_no_user() { - Config* cfg = make_config("1.0", "/src", "host:/remote", true, false, false, false, false, 1, - false, 0); + Config* cfg = + make_config("1.0", "/src", "host:/remote", true, false, false, false, false, 1, false, 0); config_parse_ssh_dest(cfg); EXPECT_EQ_INT(cfg->transport, TRANSPORT_SSH); EXPECT_EQ_STR(cfg->ssh_destination, "host:/remote"); diff --git a/tests/test_scanner.c b/tests/test_scanner.c index 1ce524a..3b68cb4 100644 --- a/tests/test_scanner.c +++ b/tests/test_scanner.c @@ -18,8 +18,8 @@ static void test_scanner_single_file() { EXPECT_EQ_INT(mkdir(dir, 0755), 0); create_test_file(file1, content1); - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, + 0, false, false, false, false); EXPECT_NOT_NULL(scanner); Chunk* chunk = directory_scanner_next(scanner); @@ -47,8 +47,8 @@ static void test_scanner_multiple_files() { create_test_file(file1, content1); create_test_file(file2, content2); - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, + 0, false, false, false, false); EXPECT_NOT_NULL(scanner); const Chunk* chunk = directory_scanner_next(scanner); @@ -87,8 +87,8 @@ static void test_scanner_subdirectory() { create_test_file(root_file, content); create_test_file(sub_file, content); - DirectoryScanner* scanner = - directory_scanner_create((char*)root, false, 0, NULL, 0, NULL, 0, 0, 0, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)root, false, 0, NULL, 0, NULL, 0, 0, + 0, 0, false, false, false, false); EXPECT_NOT_NULL(scanner); int total_files = 0; @@ -111,8 +111,8 @@ static void test_scanner_empty_directory() { EXPECT_EQ_INT(mkdir(dir, 0755), 0); - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, + 0, false, false, false, false); EXPECT_NOT_NULL(scanner); const Chunk* chunk = directory_scanner_next(scanner); @@ -135,8 +135,8 @@ static void test_scanner_exclude_pattern() { create_test_file(f_tmp, content); char* exclude[] = {"*.tmp"}; - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, exclude, 1, NULL, 0, 0, 0, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, NULL, 0, 0, + 0, 0, false, false, false, false); EXPECT_NOT_NULL(scanner); Chunk* chunk = directory_scanner_next(scanner); @@ -168,8 +168,8 @@ static void test_scanner_exclude_subdirectory() { create_test_file(sub_tmp, content); char* exclude[] = {"*.tmp"}; - DirectoryScanner* scanner = - directory_scanner_create((char*)root, false, 0, exclude, 1, NULL, 0, 0, 0, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)root, false, 0, exclude, 1, NULL, 0, + 0, 0, 0, false, false, false, false); EXPECT_NOT_NULL(scanner); int total = 0; @@ -206,8 +206,8 @@ static void test_scanner_include_and_exclude() { char* exclude[] = {"*.bak"}; char* include[] = {"*.txt", "*.log"}; - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 2, 0, 0, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 2, + 0, 0, 0, false, false, false, false); EXPECT_NOT_NULL(scanner); Chunk* chunk = directory_scanner_next(scanner); @@ -243,8 +243,8 @@ static void test_scanner_max_size() { create_test_file(large, "this_content_is_longer_than_ten_chars"); /* max_size = 10 — only files <= 10 bytes */ - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 10, 0, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 10, + 0, 0, false, false, false, false); EXPECT_NOT_NULL(scanner); Chunk* chunk = directory_scanner_next(scanner); @@ -271,8 +271,8 @@ static void test_scanner_min_size() { create_test_file(data_f, "some content here"); /* min_size = 1 — only files >= 1 byte */ - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 1, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 1, + 0, false, false, false, false); EXPECT_NOT_NULL(scanner); Chunk* chunk = directory_scanner_next(scanner); @@ -301,8 +301,8 @@ static void test_scanner_size_range() { create_test_file(huge, "this is a much larger file for testing size filters"); /* Only files between 3 and 20 bytes */ - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 20, 3, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 20, + 3, 0, false, false, false, false); EXPECT_NOT_NULL(scanner); Chunk* chunk = directory_scanner_next(scanner); @@ -337,8 +337,8 @@ static void test_scanner_mixed_patterns() { /* Exclude *.bak, include *.txt, min_size=3, max_size=10 */ char* exclude[] = {"*.bak"}; char* include[] = {"*.txt"}; - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 1, 10, 3, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 1, + 10, 3, 0, false, false, false, false); EXPECT_NOT_NULL(scanner); Chunk* chunk = directory_scanner_next(scanner); @@ -368,8 +368,8 @@ static void test_scanner_no_patterns() { create_test_file(f1, "first"); create_test_file(f2, "second"); - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0, false, false, false, false); + DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, + 0, false, false, false, false); EXPECT_NOT_NULL(scanner); Chunk* chunk = directory_scanner_next(scanner);