Minor reorganization per review comments

ldionne · Jannik2099 · commit 20f0babdf2b4 · 2024-12-10T21:57:49.000+01:00
diff --git a/libcxx/src/filesystem/operations.cpp b/libcxx/src/filesystem/operations.cpp
@@ -278,9 +278,8 @@ bool copy_file_impl_sendfile(FileDescriptor& read_fd, FileDescriptor& write_fd,
 }
 #endif
 
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(_LIBCPP_FILESYSTEM_USE_COPY_FILE_RANGE)
 bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_code& ec) {
-#  if defined(_LIBCPP_FILESYSTEM_USE_COPY_FILE_RANGE)
   if (copy_file_impl_copy_file_range(read_fd, write_fd, ec)) {
     return true;
   }
@@ -301,9 +300,10 @@ bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_cod
     return false;
   }
   ec.clear();
-#  endif
-
-#  if defined(_LIBCPP_FILESYSTEM_USE_SENDFILE)
+  return copy_file_impl_fstream(read_fd, write_fd, ec);
+}
+#elif defined(_LIBCPP_FILESYSTEM_USE_SENDFILE)
+bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_code& ec) {
   if (copy_file_impl_sendfile(read_fd, write_fd, ec)) {
     return true;
   }
@@ -312,8 +312,6 @@ bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_cod
     return false;
   }
   ec.clear();
-#  endif
-
   return copy_file_impl_fstream(read_fd, write_fd, ec);
 }
 #elif defined(_LIBCPP_FILESYSTEM_USE_COPYFILE)

Original file line number	Diff line number	Diff line change
`@@ -278,9 +278,8 @@ bool copy_file_impl_sendfile(FileDescriptor& read_fd, FileDescriptor& write_fd,`
`278`	`278`	`}`
`279`	`279`	`#endif`
`280`	`280`
`281`		`-#if defined(__linux__) \|\| defined(__FreeBSD__)`
	`281`	`+#if defined(_LIBCPP_FILESYSTEM_USE_COPY_FILE_RANGE)`
`282`	`282`	`bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_code& ec) {`
`283`		`-# if defined(_LIBCPP_FILESYSTEM_USE_COPY_FILE_RANGE)`
`284`	`283`	`if (copy_file_impl_copy_file_range(read_fd, write_fd, ec)) {`
`285`	`284`	`return true;`
`286`	`285`	`}`
`@@ -301,9 +300,10 @@ bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_cod`
`301`	`300`	`return false;`
`302`	`301`	`}`
`303`	`302`	`ec.clear();`
`304`		`-# endif`
`305`		`-`
`306`		`-# if defined(_LIBCPP_FILESYSTEM_USE_SENDFILE)`
	`303`	`+ return copy_file_impl_fstream(read_fd, write_fd, ec);`
	`304`	`+}`
	`305`	`+#elif defined(_LIBCPP_FILESYSTEM_USE_SENDFILE)`
	`306`	`+bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_code& ec) {`
`307`	`307`	`if (copy_file_impl_sendfile(read_fd, write_fd, ec)) {`
`308`	`308`	`return true;`
`309`	`309`	`}`
`@@ -312,8 +312,6 @@ bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_cod`
`312`	`312`	`return false;`
`313`	`313`	`}`
`314`	`314`	`ec.clear();`
`315`		`-# endif`
`316`		`-`
`317`	`315`	`return copy_file_impl_fstream(read_fd, write_fd, ec);`
`318`	`316`	`}`
`319`	`317`	`#elif defined(_LIBCPP_FILESYSTEM_USE_COPYFILE)`