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,8 +71,7 @@ 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 &&
+    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);

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) &&
@@ -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_receive.c

@@ -144,12 +144,10 @@ bool file_save_to_disk(const char* root_directory, const File* file, const Confi
                 ? 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_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,
+                                                 inplace, sparse, metadata, preserve_executability,
                                                  config && config->use_fsync);
   free(parent_copy);
   free(backup_path);

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;

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));