Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2e6a804

Browse files
committed
Message style improvements
1 parentdc26ff2 commit2e6a804

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

‎src/bin/pg_amcheck/pg_amcheck.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,8 @@ main(int argc, char *argv[])
621621
*/
622622
if ((vmaj==1&&vmin<4)||vmaj==0)
623623
{
624-
pg_log_warning("--checkuniqueoption is not supported by amcheck"
625-
"version \"%s\"",amcheck_version);
624+
pg_log_warning("option%sis not supported by amcheckversion %s",
625+
"--checkunique",amcheck_version);
626626
dat->is_checkunique= false;
627627
}
628628
else

‎src/bin/pg_amcheck/t/003_check.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ ()
564564
0,
565565
[$no_output_re],
566566
[
567-
qr/pg_amcheck: warning: --checkuniqueoptionis not supported by amcheck version"1.3"/
567+
qr/pg_amcheck: warning:option--checkunique is not supported by amcheck version 1.3/
568568
],
569569
'pg_amcheck smoke test --checkunique');
570570
done_testing();

‎src/bin/pg_combinebackup/pg_combinebackup.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ main(int argc, char *argv[])
337337
* won't have the WAL ranges for the resulting manifest.
338338
*/
339339
if (manifests[n_prior_backups]==NULL)
340-
pg_fatal("can't generate a manifest because no manifest is available for the final input backup");
340+
pg_fatal("cannot generate a manifest because no manifest is available for the final input backup");
341341
}
342342
else
343343
mwriter=NULL;
@@ -655,7 +655,7 @@ check_control_files(int n_backups, char **backup_dirs)
655655
if (data_checksum_mismatch)
656656
{
657657
pg_log_warning("only some backups have checksums enabled");
658-
pg_log_warning_hint("disable, and optionally reenable, checksums on the output directory to avoid failures");
658+
pg_log_warning_hint("Disable, and optionally reenable, checksums on the output directory to avoid failures.");
659659
}
660660

661661
returnsystem_identifier;
@@ -766,9 +766,9 @@ help(const char *progname)
766766
printf(_(" -o, --output=DIRECTORY output directory\n"));
767767
printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
768768
" relocate tablespace in OLDDIR to NEWDIR\n"));
769-
printf(_(" --clone clone (reflink) instead of copying files\n"));
769+
printf(_(" --clone clone (reflink)filesinstead of copying\n"));
770770
printf(_(" --copy copy files (default)\n"));
771-
printf(_(" --copy-file-range copy using copy_file_range()syscall\n"));
771+
printf(_(" --copy-file-range copy using copy_file_range()system call\n"));
772772
printf(_(" --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
773773
" use algorithm for manifest checksums\n"));
774774
printf(_(" --no-manifest suppress generation of backup manifest\n"));
@@ -1070,7 +1070,7 @@ process_directory_recursively(Oid tsoid,
10701070
*/
10711071
bmpath=psprintf("%s/%s",input_directory,
10721072
"backup_manifest");
1073-
pg_log_warning("\"%s\" contains no entry for \"%s\"",
1073+
pg_log_warning("manifest file\"%s\" contains no entry for file \"%s\"",
10741074
bmpath,manifest_path);
10751075
pfree(bmpath);
10761076
}

‎src/bin/pg_combinebackup/reconstruct.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ make_incremental_rfile(char *filename)
449449
/* Read and validate magic number. */
450450
read_bytes(rf,&magic,sizeof(magic));
451451
if (magic!=INCREMENTAL_MAGIC)
452-
pg_fatal("file \"%s\" has bad incremental magic number (0x%x not 0x%x)",
452+
pg_fatal("file \"%s\" has bad incremental magic number (0x%x, expected 0x%x)",
453453
filename,magic,INCREMENTAL_MAGIC);
454454

455455
/* Read block count. */

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ help(void)
658658
printf(_(" --disable-triggers disable triggers during data-only restore\n"));
659659
printf(_(" --exclude-database=PATTERN exclude databases whose name matches PATTERN\n"));
660660
printf(_(" --extra-float-digits=NUM override default setting for extra_float_digits\n"));
661-
printf(_(" --filter=FILENAME exclude databasesspecified in FILENAME\n"));
661+
printf(_(" --filter=FILENAME exclude databasesbased on expressions in FILENAME\n"));
662662
printf(_(" --if-exists use IF EXISTS when dropping objects\n"));
663663
printf(_(" --inserts dump data as INSERT commands, rather than COPY\n"));
664664
printf(_(" --load-via-partition-root load partitions via the root table\n"));

‎src/bin/pg_rewind/pg_rewind.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ getRestoreCommand(const char *argv0)
11041104

11051105
restore_command=pipe_read_line(postgres_cmd->data);
11061106
if (restore_command==NULL)
1107-
pg_fatal("unable to read restore_command from target cluster");
1107+
pg_fatal("could not read restore_command from target cluster");
11081108

11091109
(void)pg_strip_crlf(restore_command);
11101110

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp