mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Message wording improvements

Browse Source
This commit is contained in:
Peter Eisentraut 2003-09-22 00:23:35 +00:00
parent 5d00f984d8
commit 6f57d63cb4
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/pg_dump/pg_dump.c
View File

@ -12,7 +12,7 @@
* by PostgreSQL * by PostgreSQL
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.347 2003/09/19 23:15:18 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.348 2003/09/22 00:23:34 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2481,7 +2481,7 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
{ {
if (j + 1 != atoi(PQgetvalue(res, j, i_attnum))) if (j + 1 != atoi(PQgetvalue(res, j, i_attnum)))
{ {
write_msg(NULL, "invalid attribute numbering in table \"%s\"\n", write_msg(NULL, "invalid column numbering in table \"%s\"\n",
tbinfo->relname); tbinfo->relname);
exit_nicely(); exit_nicely();
} }

12
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.260 2003/09/05 02:08:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.261 2003/09/22 00:23:35 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -449,7 +449,7 @@ connectOptions2(PGconn *conn)
{ {
conn->status = CONNECTION_BAD; conn->status = CONNECTION_BAD;
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("unrecognized sslmode: \"%s\"\n"), libpq_gettext("invalid sslmode value: \"%s\"\n"),
conn->sslmode); conn->sslmode);
return false; return false;
} }
@ -469,7 +469,7 @@ connectOptions2(PGconn *conn)
case 'r': /* "require" */ case 'r': /* "require" */
conn->status = CONNECTION_BAD; conn->status = CONNECTION_BAD;
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("sslmode \"%s\" invalid when SSL support is not compiled in\n"), libpq_gettext("sslmode value \"%s\" invalid when SSL support is not compiled in\n"),
conn->sslmode); conn->sslmode);
return false; return false;
} }
@ -934,12 +934,12 @@ connectDBStart(PGconn *conn)
{ {
if (node) if (node)
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("could not translate hostname \"%s\" to address: %s\n"), libpq_gettext("could not translate host name \"%s\" to address: %s\n"),
node, gai_strerror(ret)); node, gai_strerror(ret));
else else
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("could not translate local service to address: %s\n"), libpq_gettext("could not translate Unix-domain socket path \"%s\" to address: %s\n"),
gai_strerror(ret)); portstr, gai_strerror(ret));
freeaddrinfo_all(hint.ai_family, addrs); freeaddrinfo_all(hint.ai_family, addrs);
goto connect_errReturn; goto connect_errReturn;
} }

18
src/interfaces/libpq/fe-exec.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.147 2003/09/05 02:08:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.148 2003/09/22 00:23:35 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -668,7 +668,7 @@ PQsendQuery(PGconn *conn, const char *query)
/* /*
* PQsendQueryParams * PQsendQueryParams
* Like PQsendQuery, but use 3.0 protocol so we can pass parameters * Like PQsendQuery, but use protocol 3.0 so we can pass parameters
*/ */
int int
PQsendQueryParams(PGconn *conn, PQsendQueryParams(PGconn *conn,
@ -704,7 +704,7 @@ PQsendQueryParams(PGconn *conn,
/* /*
* PQsendQueryPrepared * PQsendQueryPrepared
* Like PQsendQuery, but execute a previously prepared statement, * Like PQsendQuery, but execute a previously prepared statement,
* using 3.0 protocol so we can pass parameters * using protocol 3.0 so we can pass parameters
*/ */
int int
PQsendQueryPrepared(PGconn *conn, PQsendQueryPrepared(PGconn *conn,
@ -773,7 +773,7 @@ PQsendQueryStart(PGconn *conn)
/* /*
* PQsendQueryGuts * PQsendQueryGuts
* Common code for 3.0-protocol query sending * Common code for protocol-3.0 query sending
* PQsendQueryStart should be done already * PQsendQueryStart should be done already
* *
* command may be NULL to indicate we use an already-prepared statement * command may be NULL to indicate we use an already-prepared statement
@ -795,7 +795,7 @@ PQsendQueryGuts(PGconn *conn,
if (PG_PROTOCOL_MAJOR(conn->pversion) < 3) if (PG_PROTOCOL_MAJOR(conn->pversion) < 3)
{ {
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("function requires at least 3.0 protocol\n")); libpq_gettext("function requires at least protocol version 3.0\n"));
return 0; return 0;
} }
@ -1131,7 +1131,7 @@ PQexec(PGconn *conn, const char *query)
/* /*
* PQexecParams * PQexecParams
* Like PQexec, but use 3.0 protocol so we can pass parameters * Like PQexec, but use protocol 3.0 so we can pass parameters
*/ */
PGresult * PGresult *
PQexecParams(PGconn *conn, PQexecParams(PGconn *conn,
@ -1155,7 +1155,7 @@ PQexecParams(PGconn *conn,
/* /*
* PQexecPrepared * PQexecPrepared
* Like PQexec, but execute a previously prepared statement, * Like PQexec, but execute a previously prepared statement,
* using 3.0 protocol so we can pass parameters * using protocol 3.0 so we can pass parameters
*/ */
PGresult * PGresult *
PQexecPrepared(PGconn *conn, PQexecPrepared(PGconn *conn,
@ -1429,7 +1429,7 @@ PQputCopyEnd(PGconn *conn, const char *errormsg)
{ {
/* Ooops, no way to do this in 2.0 */ /* Ooops, no way to do this in 2.0 */
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("function requires at least 3.0 protocol\n")); libpq_gettext("function requires at least protocol version 3.0\n"));
return -1; return -1;
} }
else else
@ -1597,7 +1597,7 @@ PQputnbytes(PGconn *conn, const char *buffer, int nbytes)
* After completing the data transfer portion of a copy in/out, * After completing the data transfer portion of a copy in/out,
* the application must call this routine to finish the command protocol. * the application must call this routine to finish the command protocol.
* *
* When using 3.0 protocol this is deprecated; it's cleaner to use PQgetResult * When using protocol 3.0 this is deprecated; it's cleaner to use PQgetResult
* to get the transfer status. Note however that when using 2.0 protocol, * to get the transfer status. Note however that when using 2.0 protocol,
* recovering from a copy failure often requires a PQreset. PQendcopy will * recovering from a copy failure often requires a PQreset. PQendcopy will
* take care of that, PQgetResult won't. * take care of that, PQgetResult won't.