]> granicus.if.org Git - postgresql/commitdiff
Make some messages more consistent
authorPeter Eisentraut <peter_e@gmx.net>
Thu, 31 May 2007 15:13:06 +0000 (15:13 +0000)
committerPeter Eisentraut <peter_e@gmx.net>
Thu, 31 May 2007 15:13:06 +0000 (15:13 +0000)
contrib/pg_standby/pg_standby.c
src/backend/access/transam/xlog.c
src/backend/commands/tablespace.c
src/bin/initdb/initdb.c
src/bin/pg_config/pg_config.c
src/bin/pg_ctl/pg_ctl.c
src/interfaces/ecpg/ecpglib/error.c
src/pl/plpython/plpython.c
src/test/regress/pg_regress.c
src/timezone/pgtz.c

index 83a7cee8678a738f8cee923631d097c0908c6ac3..de3ad5ed2e43dcde3fcb894c3b8d9361b4c276ad 100644 (file)
@@ -270,7 +270,7 @@ CustomizableCleanupPriorWALFiles(void)
 
                                        rc = unlink(WALFilePath);
                                        if (rc !=0 )
-                                               fprintf(stderr, "\npg_standby: ERROR failed to remove \"%s\" because %s\n", WALFilePath,  strerror(errno));
+                                               fprintf(stderr, "\npg_standby: ERROR failed to remove \"%s\": %s\n", WALFilePath,  strerror(errno));
 
 
                                }
@@ -320,7 +320,7 @@ CheckForExternalTrigger(void)
                rc = unlink(triggerPath);
                if (rc != 0)
                {
-                       fprintf(stderr, "\n ERROR: unable to remove \"%s\", because %s", triggerPath, strerror(errno));
+                       fprintf(stderr, "\n ERROR: could not remove \"%s\": %s", triggerPath, strerror(errno));
                        fflush(stderr);
                        exit(rc);
                }
index afbd8ae4346395c7ffd625ad426e5d09ce278820..74f92e3ef4ac9ffc5cb18e070e74ce833ea9cbfa 100644 (file)
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.271 2007/05/31 07:36:12 petere Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.272 2007/05/31 15:13:01 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2933,7 +2933,7 @@ ReadRecord(XLogRecPtr *RecPtr, int emode)
                {
                        ereport(emode,
                                        (errcode_for_file_access(),
-                                        errmsg("could not read from log file %u, segment %u at offset %u: %m",
+                                        errmsg("could not read from log file %u, segment %u, offset %u: %m",
                                                        readId, readSeg, readOff)));
                        goto next_record_is_invalid;
                }
index 16a9f52bd5f7ad2194a5fed1f7dd64a12f25a325..adceda634dec6afcb16fd14107f81fa2fa40e7f7 100644 (file)
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.45 2007/03/22 19:51:44 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.46 2007/05/31 15:13:02 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -570,7 +570,7 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)
                if (rmdir(subfile) < 0)
                        ereport(ERROR,
                                        (errcode_for_file_access(),
-                                        errmsg("could not delete directory \"%s\": %m",
+                                        errmsg("could not remove directory \"%s\": %m",
                                                        subfile)));
 
                pfree(subfile);
index 2be097a0b9ef6373d664428db753308198b1b97f..45d786f5c43f9070d09fde8098cd674285c3980a 100644 (file)
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.136 2007/03/29 22:46:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.137 2007/05/31 15:13:03 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2328,7 +2328,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
 
        if (_CreateRestrictedToken == NULL)
        {
-               fprintf(stderr, "WARNING: Unable to create restricted tokens on this platform\n");
+               fprintf(stderr, "WARNING: cannot create restricted tokens on this platform\n");
                if (Advapi32Handle != NULL)
                        FreeLibrary(Advapi32Handle);
                return 0;
@@ -3005,7 +3005,7 @@ main(int argc, char *argv[])
                        exit_nicely();
                }
 #else
-               fprintf(stderr, _("%s: symlinks are not supported on this plataform"));
+               fprintf(stderr, _("%s: symlinks are not supported on this platform"));
                exit_nicely();
 #endif
        }
index 40ff76fb7272eff4b771eca1d61db7ee90341815..f7085bc7e595112f07a10b152c9764a940f774ce 100644 (file)
@@ -17,7 +17,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.24 2007/02/07 00:28:54 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.25 2007/05/31 15:13:04 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -469,7 +469,7 @@ main(int argc, char **argv)
 
        if (ret)
        {
-               fprintf(stderr, _("%s: could not find own executable\n"), progname);
+               fprintf(stderr, _("%s: could not find own program executable\n"), progname);
                exit(1);
        }
 
index 789b3bfb2e523a3c6e78395fe2f86adcc76635b4..3b819c44649fee01d521edd71e14c5f7c44b3b11 100644 (file)
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.79 2007/03/18 16:50:44 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.80 2007/05/31 15:13:04 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1257,7 +1257,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
                 * NT4 doesn't have CreateRestrictedToken, so just call ordinary
                 * CreateProcess
                 */
-               write_stderr("WARNING: Unable to create restricted tokens on this platform\n");
+               write_stderr("WARNING: cannot create restricted tokens on this platform\n");
                if (Advapi32Handle != NULL)
                        FreeLibrary(Advapi32Handle);
                return CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, processInfo);
@@ -1332,7 +1332,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
                         * Log error if we can't get version, or if we're on WinXP/2003 or
                         * newer
                         */
-                       write_stderr("WARNING: Unable to locate all job object functions in system API!\n");
+                       write_stderr("WARNING: could not locate all job object functions in system API\n");
        }
        else
        {
index 3f811377bdb99af98c08cced05012e7e83cc4d7a..12d948b3d171e2895cc14c8d350ad0af935fd572 100644 (file)
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.15 2006/10/04 00:30:11 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.16 2007/05/31 15:13:05 petere Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -62,7 +62,7 @@ ECPGraise(int line, int code, const char *sqlstate, const char *str)
 
                case ECPG_CONVERT_BOOL:
                        snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-                                        "Unable to convert %s to bool on line %d.", str, line);
+                                        "Could not convert %s to bool on line %d.", str, line);
                        break;
 
                case ECPG_EMPTY:
index c37fc2dac1a5488ebd9f0e82f06ec43e4b94fc53..b7172cd2dd5e15ef651f43205e52b485c4ee7064 100644 (file)
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plpython.c - python as a procedural language for PostgreSQL
  *
- *     $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.100 2007/04/04 17:28:11 momjian Exp $
+ *     $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.101 2007/05/31 15:13:05 petere Exp $
  *
  *********************************************************************
  */
@@ -484,7 +484,7 @@ PLy_modify_tuple(PLyProcedure * proc, PyObject * pltd, TriggerData *tdata,
        PG_TRY();
        {
                if ((plntup = PyDict_GetItemString(pltd, "new")) == NULL)
-                       elog(ERROR, "TD[\"new\"] deleted, unable to modify tuple");
+                       elog(ERROR, "TD[\"new\"] deleted, cannot modify tuple");
                if (!PyDict_Check(plntup))
                        elog(ERROR, "TD[\"new\"] is not a dictionary object");
                Py_INCREF(plntup);
@@ -2822,7 +2822,7 @@ PLy_output(volatile int level, PyObject * self, PyObject * args)
        if (so == NULL || ((sv = PyString_AsString(so)) == NULL))
        {
                level = ERROR;
-               sv = "Unable to parse error message in `plpy.elog'";
+               sv = "could not parse error message in `plpy.elog'";
        }
 
        oldcontext = CurrentMemoryContext;
index dbab585d67243286ab669746d31584d9c97ee636..0103b8868a2ca2704c5fb499f7f635e557ca5dd4 100644 (file)
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.31 2007/02/08 19:48:28 tgl Exp $
+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.32 2007/05/31 15:13:06 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -886,14 +886,14 @@ spawn_process(const char *cmdline)
    {
       if (Advapi32Handle != NULL)
        FreeLibrary(Advapi32Handle);
-      fprintf(stderr, "ERROR: Unable to create restricted tokens on this platform\n");
+      fprintf(stderr, "ERROR: cannot create restricted tokens on this platform\n");
       exit_nicely(2);
    }
 
    /* Open the current token to use as base for the restricted one */
    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &origToken))
    {
-      fprintf(stderr, "Failed to open process token: %lu\n", GetLastError());
+      fprintf(stderr, "could not open process token: %lu\n", GetLastError());
       exit_nicely(2);
    }
 
@@ -904,7 +904,7 @@ spawn_process(const char *cmdline)
                 !AllocateAndInitializeSid(&NtAuthority, 2,
                   SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS, 0, 0, 0, 0, 0, 0, &dropSids[1].Sid))
    {
-      fprintf(stderr, "Failed to allocate SIDs: %lu\n", GetLastError());
+      fprintf(stderr, "could not allocate SIDs: %lu\n", GetLastError());
       exit_nicely(2);
    }
        
@@ -923,7 +923,7 @@ spawn_process(const char *cmdline)
    
    if (!b)
    {
-      fprintf(stderr, "Failed to create restricted token: %lu\n", GetLastError());
+      fprintf(stderr, "could not create restricted token: %lu\n", GetLastError());
       exit_nicely(2);
    }
 
index 3be06895312b49f3eb7d431cfa19208e7a59bb4d..ac97e9815300a453e85df92435546a83517f5286 100644 (file)
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.50 2007/02/10 14:58:55 petere Exp $
+ *       $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.51 2007/05/31 15:13:06 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -455,7 +455,7 @@ identify_system_timezone(void)
        if (std_zone_name[0] == '\0')
        {
                ereport(LOG,
-                               (errmsg("unable to determine system timezone, defaulting to \"%s\"", "GMT"),
+                               (errmsg("could not determine system time zone, defaulting to \"%s\"", "GMT"),
                errhint("You can specify the correct timezone in postgresql.conf.")));
                return NULL;                    /* go to GMT */
        }