Message wording improvements

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index c70fb5287a7560ad44c6523fbd814a3897bf1c8c..010e6753ed704fd4513787198993c4e5f4b7c2db 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  * by PostgreSQL
  *
  * 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)))
            {
-               write_msg(NULL, "invalid attribute numbering in table \"%s\"\n",
+               write_msg(NULL, "invalid column numbering in table \"%s\"\n",
                          tbinfo->relname);
                exit_nicely();
            }

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 9c2d7be4fa2df4f2ab83e8587c69afec6ffec39c..c0526b75bf3990070cd586e20c4b75481d3f22e7 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * 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;
            printfPQExpBuffer(&conn->errorMessage,
-                        libpq_gettext("unrecognized sslmode: \"%s\"\n"),
+                        libpq_gettext("invalid sslmode value: \"%s\"\n"),
                              conn->sslmode);
            return false;
        }
@@ -469,7 +469,7 @@ connectOptions2(PGconn *conn)
            case 'r':           /* "require" */
                conn->status = CONNECTION_BAD;
                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);
                return false;
        }
@@ -934,12 +934,12 @@ connectDBStart(PGconn *conn)
    {
        if (node)
            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));
        else
            printfPQExpBuffer(&conn->errorMessage,
-                             libpq_gettext("could not translate local service to address: %s\n"),
-                             gai_strerror(ret));
+                             libpq_gettext("could not translate Unix-domain socket path \"%s\" to address: %s\n"),
+                             portstr, gai_strerror(ret));
        freeaddrinfo_all(hint.ai_family, addrs);
        goto connect_errReturn;
    }

diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index af176d919d8014f0107e298188daaf7869f03c3c..aadfe0b5f821a74d5ee3da2b95cc86e5cdce2558 100644 (file)
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -8,7 +8,7 @@
  *
  *
  * 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
- *     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
 PQsendQueryParams(PGconn *conn,
@@ -704,7 +704,7 @@ PQsendQueryParams(PGconn *conn,
 /*
  * PQsendQueryPrepared
  *     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
 PQsendQueryPrepared(PGconn *conn,
@@ -773,7 +773,7 @@ PQsendQueryStart(PGconn *conn)
 
 /*
  * PQsendQueryGuts
- *     Common code for 3.0-protocol query sending
+ *     Common code for protocol-3.0 query sending
  *     PQsendQueryStart should be done already
  *
  * 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)
    {
        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;
    }
 
@@ -1131,7 +1131,7 @@ PQexec(PGconn *conn, const char *query)
 
 /*
  * 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 *
 PQexecParams(PGconn *conn,
@@ -1155,7 +1155,7 @@ PQexecParams(PGconn *conn,
 /*
  * PQexecPrepared
  *     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 *
 PQexecPrepared(PGconn *conn,
@@ -1429,7 +1429,7 @@ PQputCopyEnd(PGconn *conn, const char *errormsg)
        {
            /* Ooops, no way to do this in 2.0 */
            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;
        }
        else
@@ -1597,7 +1597,7 @@ PQputnbytes(PGconn *conn, const char *buffer, int nbytes)
  *     After completing the data transfer portion of a copy in/out,
  *     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,
  * recovering from a copy failure often requires a PQreset.  PQendcopy will
  * take care of that, PQgetResult won't.