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

Commitbff074b

Browse files
committed
Message style cleanup
1 parentce2fc20 commitbff074b

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎src/bin/pg_basebackup/pg_basebackup.c‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -118,23 +118,23 @@ xmalloc0(int size)
118118
staticvoid
119119
usage(void)
120120
{
121-
printf(_("%s takes basebackups of running PostgreSQLservers\n\n"),
121+
printf(_("%s takesabasebackup ofarunning PostgreSQLserver.\n\n"),
122122
progname);
123123
printf(_("Usage:\n"));
124124
printf(_(" %s [OPTION]...\n"),progname);
125125
printf(_("\nOptions controlling the output:\n"));
126-
printf(_(" -D, --pgdata=directory receive base backup into directory\n"));
127-
printf(_(" -F, --format=p|toutput format (plain, tar)\n"));
128-
printf(_(" -x, --xloginclude required WAL files in backup\n"));
129-
printf(_(" -Z, --compress=0-9compress tar output\n"));
126+
printf(_(" -D, --pgdata=DIRECTORY receive base backup into directory\n"));
127+
printf(_(" -F, --format=p|t output format (plain, tar)\n"));
128+
printf(_(" -x, --xlog include required WAL files in backup\n"));
129+
printf(_(" -Z, --compress=0-9 compress tar output\n"));
130130
printf(_("\nGeneral options:\n"));
131131
printf(_(" -c, --checkpoint=fast|spread\n"
132-
" set fast or spread checkpointing\n"));
133-
printf(_(" -l, --label=label set backup label\n"));
134-
printf(_(" -P, --progressshow progress information\n"));
135-
printf(_(" -v, --verboseoutput verbose messages\n"));
136-
printf(_(" -?, --help show this help, then exit\n"));
137-
printf(_(" -V, --version output version information, then exit\n"));
132+
" set fast or spread checkpointing\n"));
133+
printf(_(" -l, --label=LABEL set backup label\n"));
134+
printf(_(" -P, --progress show progress information\n"));
135+
printf(_(" -v, --verbose output verbose messages\n"));
136+
printf(_(" --help show this help, then exit\n"));
137+
printf(_(" --version output version information, then exit\n"));
138138
printf(_("\nConnection options:\n"));
139139
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));
140140
printf(_(" -p, --port=PORT database server port number\n"));
@@ -337,7 +337,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
337337
res=PQgetResult(conn);
338338
if (PQresultStatus(res)!=PGRES_COPY_OUT)
339339
{
340-
fprintf(stderr,_("%s: could not get COPY data stream: %s\n"),
340+
fprintf(stderr,_("%s: could not get COPY data stream: %s"),
341341
progname,PQerrorMessage(conn));
342342
disconnect_and_exit(1);
343343
}
@@ -398,7 +398,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
398398
}
399399
elseif (r==-2)
400400
{
401-
fprintf(stderr,_("%s: could not read COPY data: %s\n"),
401+
fprintf(stderr,_("%s: could not read COPY data: %s"),
402402
progname,PQerrorMessage(conn));
403403
disconnect_and_exit(1);
404404
}
@@ -467,7 +467,7 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
467467
res=PQgetResult(conn);
468468
if (PQresultStatus(res)!=PGRES_COPY_OUT)
469469
{
470-
fprintf(stderr,_("%s: could not get COPY data stream: %s\n"),
470+
fprintf(stderr,_("%s: could not get COPY data stream: %s"),
471471
progname,PQerrorMessage(conn));
472472
disconnect_and_exit(1);
473473
}
@@ -496,7 +496,7 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
496496
}
497497
elseif (r==-2)
498498
{
499-
fprintf(stderr,_("%s: could not read COPY data: %s\n"),
499+
fprintf(stderr,_("%s: could not read COPY data: %s"),
500500
progname,PQerrorMessage(conn));
501501
disconnect_and_exit(1);
502502
}
@@ -510,23 +510,23 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
510510
*/
511511
if (r!=512)
512512
{
513-
fprintf(stderr,_("%s:Invalid tar block header size: %i\n"),
513+
fprintf(stderr,_("%s:invalid tar block header size: %i\n"),
514514
progname,r);
515515
disconnect_and_exit(1);
516516
}
517517
totaldone+=512;
518518

519519
if (sscanf(copybuf+124,"%11o",&current_len_left)!=1)
520520
{
521-
fprintf(stderr,_("%s: could not parse file size!\n"),
521+
fprintf(stderr,_("%s: could not parse file size\n"),
522522
progname);
523523
disconnect_and_exit(1);
524524
}
525525

526526
/* Set permissions on the file */
527527
if (sscanf(&copybuf[100],"%07o ",&filemode)!=1)
528528
{
529-
fprintf(stderr,_("%s: could not parse file mode!\n"),
529+
fprintf(stderr,_("%s: could not parse file mode\n"),
530530
progname);
531531
disconnect_and_exit(1);
532532
}
@@ -581,7 +581,7 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
581581
}
582582
else
583583
{
584-
fprintf(stderr,_("%s:unknown link indicator \"%c\"\n"),
584+
fprintf(stderr,_("%s:unrecognized link indicator \"%c\"\n"),
585585
progname,copybuf[156]);
586586
disconnect_and_exit(1);
587587
}
@@ -659,7 +659,7 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
659659

660660
if (file!=NULL)
661661
{
662-
fprintf(stderr,_("%s: last file was never finished!\n"),progname);
662+
fprintf(stderr,_("%s: last file was never finished\n"),progname);
663663
disconnect_and_exit(1);
664664
}
665665

@@ -740,7 +740,7 @@ GetConnection(void)
740740

741741
if (PQstatus(tmpconn)!=CONNECTION_OK)
742742
{
743-
fprintf(stderr,_("%s: could not connect to server: %s\n"),
743+
fprintf(stderr,_("%s: could not connect to server: %s"),
744744
progname,PQerrorMessage(tmpconn));
745745
exit(1);
746746
}
@@ -780,7 +780,7 @@ BaseBackup(void)
780780

781781
if (PQsendQuery(conn,current_path)==0)
782782
{
783-
fprintf(stderr,_("%s: could not start base backup: %s\n"),
783+
fprintf(stderr,_("%s: could not start base backup: %s"),
784784
progname,PQerrorMessage(conn));
785785
disconnect_and_exit(1);
786786
}
@@ -791,13 +791,13 @@ BaseBackup(void)
791791
res=PQgetResult(conn);
792792
if (PQresultStatus(res)!=PGRES_TUPLES_OK)
793793
{
794-
fprintf(stderr,_("%s: could not initiate base backup: %s\n"),
794+
fprintf(stderr,_("%s: could not initiate base backup: %s"),
795795
progname,PQerrorMessage(conn));
796796
disconnect_and_exit(1);
797797
}
798798
if (PQntuples(res)!=1)
799799
{
800-
fprintf(stderr,_("%s: no start point returned from server.\n"),
800+
fprintf(stderr,_("%s: no start point returned from server\n"),
801801
progname);
802802
disconnect_and_exit(1);
803803
}
@@ -813,13 +813,13 @@ BaseBackup(void)
813813
res=PQgetResult(conn);
814814
if (PQresultStatus(res)!=PGRES_TUPLES_OK)
815815
{
816-
fprintf(stderr,_("%s: could not get backup header: %s\n"),
816+
fprintf(stderr,_("%s: could not get backup header: %s"),
817817
progname,PQerrorMessage(conn));
818818
disconnect_and_exit(1);
819819
}
820820
if (PQntuples(res)<1)
821821
{
822-
fprintf(stderr,_("%s: no data returned from server.\n"),progname);
822+
fprintf(stderr,_("%s: no data returned from server\n"),progname);
823823
disconnect_and_exit(1);
824824
}
825825

@@ -847,7 +847,7 @@ BaseBackup(void)
847847
*/
848848
if (format=='t'&&strcmp(basedir,"-")==0&&PQntuples(res)>1)
849849
{
850-
fprintf(stderr,_("%s: can only write single tablespace to stdout, database has %i.\n"),
850+
fprintf(stderr,_("%s: can only write single tablespace to stdout, database has %i\n"),
851851
progname,PQntuples(res));
852852
disconnect_and_exit(1);
853853
}
@@ -876,13 +876,13 @@ BaseBackup(void)
876876
res=PQgetResult(conn);
877877
if (PQresultStatus(res)!=PGRES_TUPLES_OK)
878878
{
879-
fprintf(stderr,_("%s: could not get end xlog position from server.\n"),
879+
fprintf(stderr,_("%s: could not get end xlog position from server\n"),
880880
progname);
881881
disconnect_and_exit(1);
882882
}
883883
if (PQntuples(res)!=1)
884884
{
885-
fprintf(stderr,_("%s: no end point returned from server.\n"),
885+
fprintf(stderr,_("%s: no end point returned from server\n"),
886886
progname);
887887
disconnect_and_exit(1);
888888
}
@@ -894,7 +894,7 @@ BaseBackup(void)
894894
res=PQgetResult(conn);
895895
if (PQresultStatus(res)!=PGRES_COMMAND_OK)
896896
{
897-
fprintf(stderr,_("%s: final receive failed: %s\n"),
897+
fprintf(stderr,_("%s: final receive failed: %s"),
898898
progname,PQerrorMessage(conn));
899899
disconnect_and_exit(1);
900900
}
@@ -905,7 +905,7 @@ BaseBackup(void)
905905
PQfinish(conn);
906906

907907
if (verbose)
908-
fprintf(stderr,"%s: base backup completed.\n",progname);
908+
fprintf(stderr,"%s: base backup completed\n",progname);
909909
}
910910

911911

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp