@@ -196,7 +196,7 @@ reconstruct_from_incremental_file(char *input_filename,
196
196
197
197
/* We need to know the length of the file. */
198
198
if (fstat (s -> fd , & sb ) < 0 )
199
- pg_fatal ("could not stat \"%s\": %m" , s -> filename );
199
+ pg_fatal ("could not stat file \"%s\": %m" , s -> filename );
200
200
201
201
/*
202
202
* Since we found a full file, source all blocks from it that
@@ -297,8 +297,7 @@ reconstruct_from_incremental_file(char *input_filename,
297
297
* The directory is out of sync with the backup_manifest, so emit
298
298
* a warning.
299
299
*/
300
- /*- translator: the first %s is a backup manifest file, the second is a file absent therein */
301
- pg_log_warning ("\"%s\" contains no entry for \"%s\"" ,
300
+ pg_log_warning ("manifest file \"%s\" contains no entry for file \"%s\"" ,
302
301
path ,
303
302
manifest_path );
304
303
pfree (path );
@@ -354,7 +353,7 @@ reconstruct_from_incremental_file(char *input_filename,
354
353
if (s == NULL )
355
354
continue ;
356
355
if (close (s -> fd ) != 0 )
357
- pg_fatal ("could not close \"%s\": %m" , s -> filename );
356
+ pg_fatal ("could not close file \"%s\": %m" , s -> filename );
358
357
if (s -> relative_block_numbers != NULL )
359
358
pfree (s -> relative_block_numbers );
360
359
pg_free (s -> filename );
@@ -406,7 +405,7 @@ debug_reconstruction(int n_source, rfile **sources, bool dry_run)
406
405
struct stat sb ;
407
406
408
407
if (fstat (s -> fd , & sb ) < 0 )
409
- pg_fatal ("could not stat \"%s\": %m" , s -> filename );
408
+ pg_fatal ("could not stat file \"%s\": %m" , s -> filename );
410
409
if (sb .st_size < s -> highest_offset_read )
411
410
pg_fatal ("file \"%s\" is too short: expected %llu, found %llu" ,
412
411
s -> filename ,
@@ -527,7 +526,7 @@ read_bytes(rfile *rf, void *buffer, unsigned length)
527
526
if (rb < 0 )
528
527
pg_fatal ("could not read file \"%s\": %m" , rf -> filename );
529
528
else
530
- pg_fatal ("could not read file \"%s\": read only %d of %u bytes " ,
529
+ pg_fatal ("could not read file \"%s\": read %d of %u" ,
531
530
rf -> filename , rb , length );
532
531
}
533
532
}
@@ -725,7 +724,7 @@ write_reconstructed_file(char *input_filename,
725
724
726
725
/* Close the output file. */
727
726
if (wfd >= 0 && close (wfd ) != 0 )
728
- pg_fatal ("could not close \"%s\": %m" , output_filename );
727
+ pg_fatal ("could not close file \"%s\": %m" , output_filename );
729
728
}
730
729
731
730
/*
@@ -746,7 +745,7 @@ write_block(int fd, char *output_filename,
746
745
if (wb < 0 )
747
746
pg_fatal ("could not write file \"%s\": %m" , output_filename );
748
747
else
749
- pg_fatal ("could not write file \"%s\": wrote only %d of %d bytes " ,
748
+ pg_fatal ("could not write file \"%s\": wrote %d of %d" ,
750
749
output_filename , wb , BLCKSZ );
751
750
}
752
751
@@ -769,10 +768,9 @@ read_block(rfile *s, off_t off, uint8 *buffer)
769
768
if (rb != BLCKSZ )
770
769
{
771
770
if (rb < 0 )
772
- pg_fatal ("could not read file \"%s\": %m" , s -> filename );
771
+ pg_fatal ("could not read from file \"%s\": %m" , s -> filename );
773
772
else
774
- pg_fatal ("could not read file \"%s\": read only %d of %d bytes at offset %llu" ,
775
- s -> filename , rb , BLCKSZ ,
776
- (unsigned long long ) off );
773
+ pg_fatal ("could not read from file \"%s\", offset %llu: read %d of %d" ,
774
+ s -> filename , (unsigned long long ) off , rb , BLCKSZ );
777
775
}
778
776
}
0 commit comments