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

Commit32b58d0

Browse files
committed
Fix various infelicities that have snuck into usage of errdetail() and
friends. Avoid double translation of some messages, ensure other messagesare exposed for translation (and make them follow the style guidelines),avoid unsafe passing of an unpredictable message text as a format string.
1 parent3da2a4b commit32b58d0

File tree

4 files changed

+25
-26
lines changed

4 files changed

+25
-26
lines changed

‎src/backend/catalog/aclchk.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.143 2008/01/01 19:45:48 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.144 2008/03/24 19:12:49 tgl Exp $
1212
*
1313
* NOTES
1414
* See acl.h.
@@ -246,7 +246,7 @@ ExecuteGrantStmt(GrantStmt *stmt)
246246
{
247247
InternalGrantistmt;
248248
ListCell*cell;
249-
char*errormsg;
249+
constchar*errormsg;
250250
AclModeall_privileges;
251251

252252
/*
@@ -294,31 +294,31 @@ ExecuteGrantStmt(GrantStmt *stmt)
294294
*/
295295
caseACL_OBJECT_RELATION:
296296
all_privileges=ACL_ALL_RIGHTS_RELATION |ACL_ALL_RIGHTS_SEQUENCE;
297-
errormsg=_("invalid privilege type %s for relation");
297+
errormsg=gettext_noop("invalid privilege type %s for relation");
298298
break;
299299
caseACL_OBJECT_SEQUENCE:
300300
all_privileges=ACL_ALL_RIGHTS_SEQUENCE;
301-
errormsg=_("invalid privilege type %s for sequence");
301+
errormsg=gettext_noop("invalid privilege type %s for sequence");
302302
break;
303303
caseACL_OBJECT_DATABASE:
304304
all_privileges=ACL_ALL_RIGHTS_DATABASE;
305-
errormsg=_("invalid privilege type %s for database");
305+
errormsg=gettext_noop("invalid privilege type %s for database");
306306
break;
307307
caseACL_OBJECT_FUNCTION:
308308
all_privileges=ACL_ALL_RIGHTS_FUNCTION;
309-
errormsg=_("invalid privilege type %s for function");
309+
errormsg=gettext_noop("invalid privilege type %s for function");
310310
break;
311311
caseACL_OBJECT_LANGUAGE:
312312
all_privileges=ACL_ALL_RIGHTS_LANGUAGE;
313-
errormsg=_("invalid privilege type %s for language");
313+
errormsg=gettext_noop("invalid privilege type %s for language");
314314
break;
315315
caseACL_OBJECT_NAMESPACE:
316316
all_privileges=ACL_ALL_RIGHTS_NAMESPACE;
317-
errormsg=_("invalid privilege type %s for schema");
317+
errormsg=gettext_noop("invalid privilege type %s for schema");
318318
break;
319319
caseACL_OBJECT_TABLESPACE:
320320
all_privileges=ACL_ALL_RIGHTS_TABLESPACE;
321-
errormsg=_("invalid privilege type %s for tablespace");
321+
errormsg=gettext_noop("invalid privilege type %s for tablespace");
322322
break;
323323
default:
324324
/* keep compiler quiet */
@@ -351,8 +351,7 @@ ExecuteGrantStmt(GrantStmt *stmt)
351351
if (priv& ~((AclMode)all_privileges))
352352
ereport(ERROR,
353353
(errcode(ERRCODE_INVALID_GRANT_OPERATION),
354-
errmsg(errormsg,
355-
privilege_to_string(priv))));
354+
errmsg(errormsg,privilege_to_string(priv))));
356355

357356
istmt.privileges |=priv;
358357
}

‎src/backend/catalog/pg_shdepend.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_shdepend.c,v 1.23 2008/01/23 15:36:38 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_shdepend.c,v 1.24 2008/03/24 19:12:49 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -670,7 +670,7 @@ checkSharedDependencies(Oid classId, Oid objectId)
670670
ereport(LOG,
671671
(errmsg("there are objects dependent on %s",
672672
getObjectDescription(&obj)),
673-
errdetail(alldescs.data)));
673+
errdetail("%s",alldescs.data)));
674674
}
675675

676676
pfree(alldescs.data);

‎src/backend/commands/vacuumlazy.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*
3939
*
4040
* IDENTIFICATION
41-
* $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.104 2008/03/10 02:04:09 tgl Exp $
41+
* $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.105 2008/03/24 19:12:49 tgl Exp $
4242
*
4343
*-------------------------------------------------------------------------
4444
*/
@@ -212,10 +212,10 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
212212
(errmsg("relation \"%s.%s\" contains more than \"max_fsm_pages\" pages with useful free space",
213213
get_namespace_name(RelationGetNamespace(onerel)),
214214
RelationGetRelationName(onerel)),
215-
errhint((vacrelstats->tot_free_pages>vacrelstats->rel_pages*0.20 ?
216-
/* Only suggest VACUUM FULL if 20% free */
217-
"Consider using VACUUM FULL on this relation or increasing the configuration parameter \"max_fsm_pages\"." :
218-
"Consider increasing the configuration parameter \"max_fsm_pages\"."))));
215+
/* Only suggest VACUUM FULL if > 20% free */
216+
(vacrelstats->tot_free_pages>vacrelstats->rel_pages*0.20) ?
217+
errhint("Consider using VACUUM FULL on this relation or increasing the configuration parameter \"max_fsm_pages\".") :
218+
errhint("Consider increasing the configuration parameter \"max_fsm_pages\".")));
219219

220220
/* Update statistics in pg_class */
221221
vac_update_relstats(RelationGetRelid(onerel),

‎src/backend/utils/adt/xml.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.69 2008/03/01 02:46:49 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.70 2008/03/24 19:12:49 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1401,25 +1401,25 @@ xml_ereport_by_code(int level, int sqlcode,
14011401
switch (code)
14021402
{
14031403
caseXML_ERR_INVALID_CHAR:
1404-
det="Invalid character value";
1404+
det=gettext_noop("Invalid character value.");
14051405
break;
14061406
caseXML_ERR_SPACE_REQUIRED:
1407-
det="Space required";
1407+
det=gettext_noop("Space required.");
14081408
break;
14091409
caseXML_ERR_STANDALONE_VALUE:
1410-
det="standalone accepts only 'yes' or 'no'";
1410+
det=gettext_noop("standalone accepts only 'yes' or 'no'.");
14111411
break;
14121412
caseXML_ERR_VERSION_MISSING:
1413-
det="Malformed declaration expecting version";
1413+
det=gettext_noop("Malformed declaration: missing version.");
14141414
break;
14151415
caseXML_ERR_MISSING_ENCODING:
1416-
det="Missing encoding in text declaration";
1416+
det=gettext_noop("Missing encoding in text declaration.");
14171417
break;
14181418
caseXML_ERR_XMLDECL_NOT_FINISHED:
1419-
det="Parsing XML declaration: '?>' expected";
1419+
det=gettext_noop("Parsing XML declaration: '?>' expected.");
14201420
break;
14211421
default:
1422-
det="Unrecognized libxml error code: %d";
1422+
det=gettext_noop("Unrecognized libxml error code: %d.");
14231423
break;
14241424
}
14251425

0 commit comments

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