Apply clang-format 18 to merge-conflict resolution code

The Phase 1 merge conflict resolutions introduced formatting that failed
the CI lint job (clang-format 18.1.3). Reformatted with the exact CI
version; no functional changes.

src/server/receiver.c

@@ -71,10 +71,9 @@ static bool receiver_process_batch(Config* config, int file_descriptor) {
       old_mtime_nsec = st.st_mtim.tv_nsec;
 #endif
     }
-    bool match =
-        !config->ignore_times && has_old && (unsigned long long)st.st_size == check_size &&
-        metadata_mtime_matches(st.st_mtime, old_mtime_nsec, (time_t)check_mtime,
-                               (long)check_mtime_nsec, config->modify_window);
+    bool match = !config->ignore_times && has_old && (unsigned long long)st.st_size == check_size &&
+                 metadata_mtime_matches(st.st_mtime, old_mtime_nsec, (time_t)check_mtime,
+                                        (long)check_mtime_nsec, config->modify_window);
     bool sent = send_status(file_descriptor, match ? STATUS_OK : STATUS_NEXT);
     free(full_path);
     free(check_path);

src/shared/config.c

@@ -144,10 +144,9 @@ static bool validate_received_config(const Config* config) {
          valid_wire_bool(config->preserve_hard_links) && valid_wire_bool(config->preserve_acls) &&
          valid_wire_bool(config->preserve_xattrs) && valid_wire_bool(config->preserve_devices) &&
          valid_wire_bool(config->preserve_sparse) && valid_wire_bool(config->ignore_existing) &&
-         valid_wire_bool(config->existing) &&
-         valid_wire_bool(config->update) && valid_wire_bool(config->inplace) &&
-         valid_wire_bool(config->append) && valid_wire_bool(config->use_fsync) &&
-         valid_wire_bool(config->append_verify) &&
+         valid_wire_bool(config->existing) && valid_wire_bool(config->update) &&
+         valid_wire_bool(config->inplace) && valid_wire_bool(config->append) &&
+         valid_wire_bool(config->use_fsync) && valid_wire_bool(config->append_verify) &&
          valid_wire_bool(config->delete_excluded) && valid_wire_bool(config->delete_after) &&
          valid_wire_bool(config->relative) && valid_wire_bool(config->prune_empty_dirs) &&
          valid_wire_bool(config->partial) && valid_wire_bool(config->delete_before) &&
@@ -158,7 +157,7 @@ static bool validate_received_config(const Config* config) {
          config->chunk_size > 0 && config->chunk_size <= MAX_CHUNK_SIZE &&
          config->delta_block_size >= DELTA_BLOCK_SIZE_MIN &&
          config->delta_block_size <= DELTA_BLOCK_SIZE_MAX &&
-config->delta_max_file_size <= DELTA_MAX_FILE_SIZE && config->modify_window >= 0 &&
+         config->delta_max_file_size <= DELTA_MAX_FILE_SIZE && config->modify_window >= 0 &&
          config->max_delete >= 0 && config->skip_compress_count >= 0 &&
          config->skip_compress_count <= 10000 && config->max_alloc > 0 &&
          (!config->chmod_spec || !*config->chmod_spec ||
@@ -283,12 +282,11 @@ static bool send_file_options(int fd, const Config* c) {
 }
 
 static bool send_selection_options(int fd, const Config* c) {
-  return send_int(fd, c->ignore_existing) && send_int(fd, c->existing) && send_int(fd, c->update) && send_int(fd, c->inplace) &&
-         send_int(fd, c->append) && send_int(fd, c->use_fsync) &&
-         send_int(fd, c->append_verify) &&
-         send_int(fd, c->delete_excluded) && send_int(fd, c->delete_after) &&
-         send_n_data(fd, &c->max_delete, sizeof(c->max_delete)) && send_int(fd, c->relative) &&
-         send_int(fd, c->prune_empty_dirs);
+  return send_int(fd, c->ignore_existing) && send_int(fd, c->existing) && send_int(fd, c->update) &&
+         send_int(fd, c->inplace) && send_int(fd, c->append) && send_int(fd, c->use_fsync) &&
+         send_int(fd, c->append_verify) && send_int(fd, c->delete_excluded) &&
+         send_int(fd, c->delete_after) && send_n_data(fd, &c->max_delete, sizeof(c->max_delete)) &&
+         send_int(fd, c->relative) && send_int(fd, c->prune_empty_dirs);
 }
 
 static bool send_skip_compress_options(int fd, const Config* c) {
@@ -307,8 +305,7 @@ static bool send_resume_options(int fd, const Config* c) {
          send_str(fd, c->suffix ? c->suffix : "") && send_int(fd, c->delete_before) &&
          send_int(fd, c->checksum) && send_int(fd, c->modify_window) &&
          send_str(fd, c->compress_choice ? c->compress_choice : "") &&
-         send_str(fd, c->chmod_spec ? c->chmod_spec : "") &&
-         send_skip_compress_options(fd, c);
+         send_str(fd, c->chmod_spec ? c->chmod_spec : "") && send_skip_compress_options(fd, c);
 }
 
 static bool receive_core_fields(int fd, Config* c) {
@@ -372,8 +369,8 @@ static bool receive_file_options(int fd, Config* c) {
 }
 
 static bool receive_selection_options(int fd, Config* c) {
-  bool* flags[] = {&c->ignore_existing, &c->existing,   &c->update,          &c->inplace,     &c->append,
-                   &c->use_fsync,
+  bool* flags[] = {&c->ignore_existing, &c->existing,        &c->update,
+                   &c->inplace,         &c->append,          &c->use_fsync,
                    &c->append_verify,   &c->delete_excluded, &c->delete_after};
   for (size_t i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
     if (!receive_wire_bool(fd, flags[i]))
@@ -404,8 +401,7 @@ static bool receive_resume_options(int fd, Config* c) {
   if (!c->compress_choice)
     return false;
   c->chmod_spec = receive_str(fd);
-  if (!c->chmod_spec ||
-      !receive_wire_bool(fd, &c->skip_compress_set) ||
+  if (!c->chmod_spec || !receive_wire_bool(fd, &c->skip_compress_set) ||
       !receive_int(fd, &c->skip_compress_count) || c->skip_compress_count < 0 ||
       c->skip_compress_count > 10000)
     return false;

src/shared/file.c

@@ -414,14 +414,14 @@ bool file_to_disk_secure(const char* path, const void* data, unsigned long long
                          bool inplace, bool sparse, const FileMetadata* metadata,
                          bool preserve_executability) {
   return file_to_disk_secure_impl(path, data, data_size, inplace, sparse, metadata,
-                                   preserve_executability, false, false, false);
+                                  preserve_executability, false, false, false);
 }
 
 bool file_to_disk_secure_update(const char* path, const void* data, unsigned long long data_size,
                                 bool inplace, bool sparse, const FileMetadata* metadata,
                                 bool preserve_executability) {
   return file_to_disk_secure_impl(path, data, data_size, inplace, sparse, metadata,
-                                   preserve_executability, true, false, false);
+                                  preserve_executability, true, false, false);
 }
 
 bool file_to_disk_secure_with_fsync(const char* path, const void* data,
@@ -429,14 +429,14 @@ bool file_to_disk_secure_with_fsync(const char* path, const void* data,
                                     const FileMetadata* metadata, bool preserve_executability,
                                     bool use_fsync) {
   return file_to_disk_secure_impl(path, data, data_size, inplace, sparse, metadata,
-                                   preserve_executability, false, false, use_fsync);
+                                  preserve_executability, false, false, use_fsync);
 }
 
 bool file_to_disk_secure_no_replace(const char* path, const void* data,
                                     unsigned long long data_size, bool sparse,
                                     const FileMetadata* metadata, bool preserve_executability) {
   return file_to_disk_secure_impl(path, data, data_size, false, sparse, metadata,
-                                   preserve_executability, false, true, false);
+                                  preserve_executability, false, true, false);
 }
 
 bool file_write_to_disk(const char* path, const void* data, unsigned long long data_size,

src/shared/file_receive.c

@@ -142,15 +142,13 @@ bool file_save_to_disk(const char* root_directory, const File* file, const Confi
   }
   bool ok = config && config->ignore_existing
                 ? file_to_disk_secure_no_replace(disk_path, file->data->data, file->data->size,
-                                                   sparse, metadata, preserve_executability)
-                : config && config->update
-                      ? file_to_disk_secure_update(disk_path, file->data->data, file->data->size,
-                                                     inplace, sparse, metadata,
-                                                     preserve_executability)
-                      : file_to_disk_secure_with_fsync(disk_path, file->data->data, file->data->size,
-                                                         inplace, sparse, metadata,
-                                                         preserve_executability,
-                                                         config && config->use_fsync);
+                                                 sparse, metadata, preserve_executability)
+            : config && config->update
+                ? file_to_disk_secure_update(disk_path, file->data->data, file->data->size, inplace,
+                                             sparse, metadata, preserve_executability)
+                : file_to_disk_secure_with_fsync(disk_path, file->data->data, file->data->size,
+                                                 inplace, sparse, metadata, preserve_executability,
+                                                 config && config->use_fsync);
   free(parent_copy);
   free(backup_path);
   free(confined_backup);

src/shared/file_send.c

@@ -33,8 +33,8 @@ bool file_send_single_calls_with_skip(File* file, int file_descriptor, bool use_
   Data* compressed_data = NULL;
   if (compression_level > 0 &&
       !compression_should_skip_with_suffixes(file->path, skip_suffixes, skip_count)) {
-    compressed_data = data_compress_with_threads(file->data, compression_level,
-                                                 compression_threads);
+    compressed_data =
+        data_compress_with_threads(file->data, compression_level, compression_threads);
     if (compressed_data == NULL) {
       log_message(LOG_LEVEL_ERROR, "Failed to compress file data");
       return false;

src/shared/protocol.c

@@ -64,7 +64,7 @@ void io_set_fds(int read_fd, int write_fd) {
   legacy_io_session.read_fd = read_fd;
   legacy_io_session.write_fd = write_fd;
   legacy_io_session.ssl = NULL;
-legacy_io_session.eight_bit_output = false;
+  legacy_io_session.eight_bit_output = false;
   atomic_store(&legacy_io_session.total_allocated_bytes, 0);
   legacy_io_session.max_alloc = DEFAULT_MAX_ALLOC;
   protocol_session_set_bwlimit(&legacy_io_session, global_bwlimit());
@@ -473,7 +473,7 @@ Data* protocol_receive_data_limited(ProtocolSession* session, unsigned long long
     protocol_release_memory_for_session(session, allocation_size);
     return NULL;
   }
-log_debug_message(LOG_DEBUG_PROTO, "Received %lld data", size);
+  log_debug_message(LOG_DEBUG_PROTO, "Received %lld data", size);
   Data* result = data_create(data, (size_t)size);
   if (!result) {
     protocol_release_memory_for_session(session, allocation_size);

tests/test_config.c

@@ -132,7 +132,7 @@ static void test_config_send_receive() {
   send_cfg->size_only = true;
   send_cfg->compression_level = 5;
   send_cfg->chunk_size = 1024;
-send_cfg->eight_bit_output = true;
+  send_cfg->eight_bit_output = true;
   send_cfg->modify_window = 4;
   send_cfg->existing = true;
   send_cfg->ignore_existing = true;
@@ -175,7 +175,7 @@ send_cfg->eight_bit_output = true;
         ok = false;
       if (recv_cfg->chunk_size != 1024)
         ok = false;
-if (!recv_cfg->use_executability)
+      if (!recv_cfg->use_executability)
         ok = false;
       if (!recv_cfg->size_only)
         ok = false;
@@ -225,7 +225,7 @@ static void test_config_send_receive_version_mismatch() {
   Config* cfg = config_create();
   EXPECT_NOT_NULL(cfg);
   free(cfg->version);
-cfg->version = str_dup("2.3.0");
+  cfg->version = str_dup("2.3.0");
   cfg->send_directory = str_dup("/src");
   cfg->receive_root_directory = str_dup("/dst");
 

tests/test_file.c

@@ -273,8 +273,8 @@ static void test_file_write_to_disk_basic() {
 static void test_file_write_to_disk_with_fsync() {
   const char* path = "test_file_write_to_disk_fsync.txt";
   const char* content = "fsync file content";
-  EXPECT_TRUE(
-      file_to_disk_secure_with_fsync(path, content, strlen(content), false, false, NULL, false, true));
+  EXPECT_TRUE(file_to_disk_secure_with_fsync(path, content, strlen(content), false, false, NULL,
+                                             false, true));
   struct stat st;
   EXPECT_EQ_INT(stat(path, &st), 0);
   EXPECT_EQ_INT((int)st.st_size, (int)strlen(content));