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

Commit6f57d63

Browse files
committed
Message wording improvements
1 parent5d00f98 commit6f57d63

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎src/bin/pg_dump/pg_dump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*by PostgreSQL
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.347 2003/09/1923:15:18 tgl Exp $
15+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.348 2003/09/22 00:23:34 petere Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -2481,7 +2481,7 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
24812481
{
24822482
if (j+1!=atoi(PQgetvalue(res,j,i_attnum)))
24832483
{
2484-
write_msg(NULL,"invalidattribute numbering in table \"%s\"\n",
2484+
write_msg(NULL,"invalidcolumn numbering in table \"%s\"\n",
24852485
tbinfo->relname);
24862486
exit_nicely();
24872487
}

‎src/interfaces/libpq/fe-connect.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.260 2003/09/05 02:08:36 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.261 2003/09/22 00:23:35 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -449,7 +449,7 @@ connectOptions2(PGconn *conn)
449449
{
450450
conn->status=CONNECTION_BAD;
451451
printfPQExpBuffer(&conn->errorMessage,
452-
libpq_gettext("unrecognized sslmode: \"%s\"\n"),
452+
libpq_gettext("invalid sslmode value: \"%s\"\n"),
453453
conn->sslmode);
454454
return false;
455455
}
@@ -469,7 +469,7 @@ connectOptions2(PGconn *conn)
469469
case'r':/* "require" */
470470
conn->status=CONNECTION_BAD;
471471
printfPQExpBuffer(&conn->errorMessage,
472-
libpq_gettext("sslmode \"%s\" invalid when SSL support is not compiled in\n"),
472+
libpq_gettext("sslmodevalue\"%s\" invalid when SSL support is not compiled in\n"),
473473
conn->sslmode);
474474
return false;
475475
}
@@ -934,12 +934,12 @@ connectDBStart(PGconn *conn)
934934
{
935935
if (node)
936936
printfPQExpBuffer(&conn->errorMessage,
937-
libpq_gettext("could not translatehostname \"%s\" to address: %s\n"),
937+
libpq_gettext("could not translatehost name \"%s\" to address: %s\n"),
938938
node,gai_strerror(ret));
939939
else
940940
printfPQExpBuffer(&conn->errorMessage,
941-
libpq_gettext("could not translatelocal service to address: %s\n"),
942-
gai_strerror(ret));
941+
libpq_gettext("could not translateUnix-domain socket path \"%s\" to address: %s\n"),
942+
portstr,gai_strerror(ret));
943943
freeaddrinfo_all(hint.ai_family,addrs);
944944
gotoconnect_errReturn;
945945
}

‎src/interfaces/libpq/fe-exec.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.147 2003/09/05 02:08:36 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.148 2003/09/22 00:23:35 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -668,7 +668,7 @@ PQsendQuery(PGconn *conn, const char *query)
668668

669669
/*
670670
* PQsendQueryParams
671-
*Like PQsendQuery, but use 3.0 protocol so we can pass parameters
671+
*Like PQsendQuery, but useprotocol3.0 so we can pass parameters
672672
*/
673673
int
674674
PQsendQueryParams(PGconn*conn,
@@ -704,7 +704,7 @@ PQsendQueryParams(PGconn *conn,
704704
/*
705705
* PQsendQueryPrepared
706706
*Like PQsendQuery, but execute a previously prepared statement,
707-
*using 3.0 protocol so we can pass parameters
707+
*usingprotocol3.0 so we can pass parameters
708708
*/
709709
int
710710
PQsendQueryPrepared(PGconn*conn,
@@ -773,7 +773,7 @@ PQsendQueryStart(PGconn *conn)
773773

774774
/*
775775
* PQsendQueryGuts
776-
*Common code for 3.0-protocol query sending
776+
*Common code forprotocol-3.0 query sending
777777
*PQsendQueryStart should be done already
778778
*
779779
* command may be NULL to indicate we use an already-prepared statement
@@ -795,7 +795,7 @@ PQsendQueryGuts(PGconn *conn,
795795
if (PG_PROTOCOL_MAJOR(conn->pversion)<3)
796796
{
797797
printfPQExpBuffer(&conn->errorMessage,
798-
libpq_gettext("function requires at least 3.0 protocol\n"));
798+
libpq_gettext("function requires at leastprotocol version3.0\n"));
799799
return0;
800800
}
801801

@@ -1131,7 +1131,7 @@ PQexec(PGconn *conn, const char *query)
11311131

11321132
/*
11331133
* PQexecParams
1134-
*Like PQexec, but use 3.0 protocol so we can pass parameters
1134+
*Like PQexec, but useprotocol3.0 so we can pass parameters
11351135
*/
11361136
PGresult*
11371137
PQexecParams(PGconn*conn,
@@ -1155,7 +1155,7 @@ PQexecParams(PGconn *conn,
11551155
/*
11561156
* PQexecPrepared
11571157
*Like PQexec, but execute a previously prepared statement,
1158-
*using 3.0 protocol so we can pass parameters
1158+
*usingprotocol3.0 so we can pass parameters
11591159
*/
11601160
PGresult*
11611161
PQexecPrepared(PGconn*conn,
@@ -1429,7 +1429,7 @@ PQputCopyEnd(PGconn *conn, const char *errormsg)
14291429
{
14301430
/* Ooops, no way to do this in 2.0 */
14311431
printfPQExpBuffer(&conn->errorMessage,
1432-
libpq_gettext("function requires at least 3.0 protocol\n"));
1432+
libpq_gettext("function requires at leastprotocol version3.0\n"));
14331433
return-1;
14341434
}
14351435
else
@@ -1597,7 +1597,7 @@ PQputnbytes(PGconn *conn, const char *buffer, int nbytes)
15971597
*After completing the data transfer portion of a copy in/out,
15981598
*the application must call this routine to finish the command protocol.
15991599
*
1600-
* When using 3.0 protocol this is deprecated; it's cleaner to use PQgetResult
1600+
* When usingprotocol3.0 this is deprecated; it's cleaner to use PQgetResult
16011601
* to get the transfer status.Note however that when using 2.0 protocol,
16021602
* recovering from a copy failure often requires a PQreset. PQendcopy will
16031603
* take care of that, PQgetResult won't.

0 commit comments

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