@@ -291,9 +291,8 @@ int aws_s3_meta_request_init_base(
291291
292292 /* When direct_io is enabled, use O_DIRECT fd-based writes instead of FILE* fwrite.
293293 * Only supported for CREATE_OR_REPLACE and CREATE_NEW (writing from the beginning). */
294- if (meta_request -> fio_opts .direct_io &&
295- (options -> recv_file_option == AWS_S3_RECV_FILE_CREATE_OR_REPLACE ||
296- options -> recv_file_option == AWS_S3_RECV_FILE_CREATE_NEW )) {
294+ if (meta_request -> fio_opts .direct_io && (options -> recv_file_option == AWS_S3_RECV_FILE_CREATE_OR_REPLACE ||
295+ options -> recv_file_option == AWS_S3_RECV_FILE_CREATE_NEW )) {
297296
298297 /* Validate preconditions same as the FILE* path */
299298 if (options -> recv_file_option == AWS_S3_RECV_FILE_CREATE_NEW &&
@@ -309,9 +308,7 @@ int aws_s3_meta_request_init_base(
309308 meta_request -> recv_file_direct_io = true;
310309
311310 AWS_LOGF_DEBUG (
312- AWS_LS_S3_META_REQUEST ,
313- "id=%p: O_DIRECT enabled for download write path." ,
314- (void * )meta_request );
311+ AWS_LS_S3_META_REQUEST , "id=%p: O_DIRECT enabled for download write path." , (void * )meta_request );
315312 } else {
316313 /* Fail if user requested O_DIRECT with APPEND or WRITE_TO_POSITION */
317314 if (meta_request -> fio_opts .direct_io ) {
@@ -352,8 +349,7 @@ int aws_s3_meta_request_init_base(
352349 aws_raise_error (AWS_ERROR_S3_RECV_FILE_NOT_FOUND );
353350 break ;
354351 } else {
355- meta_request -> recv_file =
356- aws_fopen (aws_string_c_str (meta_request -> recv_filepath ), "r+" );
352+ meta_request -> recv_file = aws_fopen (aws_string_c_str (meta_request -> recv_filepath ), "r+" );
357353 if (meta_request -> recv_file &&
358354 aws_fseek (meta_request -> recv_file , options -> recv_file_position , SEEK_SET ) !=
359355 AWS_OP_SUCCESS ) {
@@ -2197,8 +2193,8 @@ static void s_s3_meta_request_event_delivery_task(struct aws_task *task, void *a
21972193 meta_request -> recv_file_direct_io = false;
21982194 aws_reset_error ();
21992195 /* Open FILE* and write this chunk */
2200- meta_request -> recv_file = aws_fopen (
2201- aws_string_c_str (meta_request -> recv_filepath ), "r+" );
2196+ meta_request -> recv_file =
2197+ aws_fopen ( aws_string_c_str (meta_request -> recv_filepath ), "r+" );
22022198 if (meta_request -> recv_file &&
22032199 aws_fseek (meta_request -> recv_file , (int64_t )write_offset , SEEK_SET ) ==
22042200 AWS_OP_SUCCESS ) {
@@ -2207,8 +2203,7 @@ static void s_s3_meta_request_event_delivery_task(struct aws_task *task, void *a
22072203 response_body .len ,
22082204 1 ,
22092205 meta_request -> recv_file ) < 1 ) {
2210- int errno_value =
2211- ferror (meta_request -> recv_file ) ? errno : 0 ;
2206+ int errno_value = ferror (meta_request -> recv_file ) ? errno : 0 ;
22122207 aws_translate_and_raise_io_error_or (
22132208 errno_value , AWS_ERROR_FILE_WRITE_FAILURE );
22142209 error_code = aws_last_error ();
@@ -2507,8 +2502,8 @@ void aws_s3_meta_request_finish_default(struct aws_s3_meta_request *meta_request
25072502 if (finish_result .error_code && meta_request -> recv_file_delete_on_failure ) {
25082503 aws_file_delete (meta_request -> recv_filepath );
25092504 }
2510- } else if (meta_request -> recv_file_direct_io && finish_result . error_code &&
2511- meta_request -> recv_file_delete_on_failure ) {
2505+ } else if (
2506+ meta_request -> recv_file_direct_io && finish_result . error_code && meta_request -> recv_file_delete_on_failure ) {
25122507 /* O_DIRECT path has no FILE* to close, but still honor delete-on-failure */
25132508 aws_file_delete (meta_request -> recv_filepath );
25142509 }
0 commit comments