mirror of
https://github.com/postgres/postgres.git
synced 2025-11-10 17:42:29 +03:00
Message corrections
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
* Copyright (c) 2002-2005, PostgreSQL Global Development Group
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.6 2005/10/15 02:49:28 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.7 2005/10/29 00:31:51 petere Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -53,7 +53,7 @@ db_dir_size(const char *path)
|
||||
if (stat(filename, &fst) < 0)
|
||||
ereport(ERROR,
|
||||
(errcode_for_file_access(),
|
||||
errmsg("could not stat \"%s\": %m", filename)));
|
||||
errmsg("could not stat file \"%s\": %m", filename)));
|
||||
|
||||
dirsize += fst.st_size;
|
||||
}
|
||||
@@ -175,7 +175,7 @@ calculate_tablespace_size(Oid tblspcOid)
|
||||
if (stat(pathname, &fst) < 0)
|
||||
ereport(ERROR,
|
||||
(errcode_for_file_access(),
|
||||
errmsg("could not stat \"%s\": %m", pathname)));
|
||||
errmsg("could not stat file \"%s\": %m", pathname)));
|
||||
|
||||
if (fst.st_mode & S_IFDIR)
|
||||
totalsize += db_dir_size(pathname);
|
||||
@@ -251,7 +251,7 @@ calculate_relation_size(RelFileNode *rfn)
|
||||
else
|
||||
ereport(ERROR,
|
||||
(errcode_for_file_access(),
|
||||
errmsg("could not stat \"%s\": %m", pathname)));
|
||||
errmsg("could not stat file \"%s\": %m", pathname)));
|
||||
}
|
||||
totalsize += fst.st_size;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* Author: Andreas Pflug <pgadmin@pse-consulting.de>
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.8 2005/10/15 19:47:09 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.9 2005/10/29 00:31:51 petere Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -122,7 +122,7 @@ pg_read_file(PG_FUNCTION_ARGS)
|
||||
if (bytes_to_read < 0)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||
errmsg("requested length cannot be negative")));
|
||||
errmsg("requested length may not be negative")));
|
||||
|
||||
/* not sure why anyone thought that int64 length was a good idea */
|
||||
if (bytes_to_read > (MaxAllocSize - VARHDRSZ))
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.62 2005/10/15 02:49:29 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.63 2005/10/29 00:31:51 petere Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -214,7 +214,7 @@ win32_utf8_wcstotext(const wchar_t *str)
|
||||
if (nbytes == 0) /* shouldn't happen */
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
|
||||
errmsg("UTF16 to UTF8 translation failed: %lu",
|
||||
errmsg("UTF-16 to UTF-8 translation failed: %lu",
|
||||
GetLastError())));
|
||||
|
||||
result = palloc(nbytes + VARHDRSZ);
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.138 2005/10/18 20:38:58 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.139 2005/10/29 00:31:51 petere Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -888,7 +888,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
|
||||
(LPWSTR) a1p, a1len / 2);
|
||||
if (!r)
|
||||
ereport(ERROR,
|
||||
(errmsg("could not convert string to UTF16: %lu",
|
||||
(errmsg("could not convert string to UTF-16: error %lu",
|
||||
GetLastError())));
|
||||
}
|
||||
((LPWSTR) a1p)[r] = 0;
|
||||
@@ -901,7 +901,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
|
||||
(LPWSTR) a2p, a2len / 2);
|
||||
if (!r)
|
||||
ereport(ERROR,
|
||||
(errmsg("could not convert string to UTF16: %lu",
|
||||
(errmsg("could not convert string to UTF-16: error %lu",
|
||||
GetLastError())));
|
||||
}
|
||||
((LPWSTR) a2p)[r] = 0;
|
||||
@@ -911,8 +911,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
|
||||
if (result == 2147483647) /* _NLSCMPERROR; missing from mingw
|
||||
* headers */
|
||||
ereport(ERROR,
|
||||
(errmsg("could not compare unicode strings: %d",
|
||||
errno)));
|
||||
(errmsg("could not compare Unicode strings: %m")));
|
||||
|
||||
if (a1p != a1buf)
|
||||
pfree(a1p);
|
||||
|
||||
Reference in New Issue
Block a user