diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/adt/xml.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/fmgr/dfmgr.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 20 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index de1eb2af369..945bc2901fa 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -1364,14 +1364,14 @@ xml_ereport(int level, int sqlcode, const char *msg) ereport(level, (errcode(sqlcode), - errmsg("%s", msg), - errdetail("%s", detail))); + errmsg_internal("%s", msg), + errdetail_internal("%s", detail))); } else { ereport(level, (errcode(sqlcode), - errmsg("%s", msg))); + errmsg_internal("%s", msg))); } } @@ -1442,7 +1442,7 @@ xml_ereport_by_code(int level, int sqlcode, ereport(level, (errcode(sqlcode), - errmsg("%s", msg), + errmsg_internal("%s", msg), errdetail(det, code))); } diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 97a3bd51e5d..734bd056891 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -378,7 +378,7 @@ incompatible_module_error(const char *libname, ereport(ERROR, (errmsg("incompatible library \"%s\": magic block mismatch", libname), - errdetail("%s", details.data))); + errdetail_internal("%s", details.data))); } /* diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 5841631e8c3..72e93107910 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -7975,11 +7975,11 @@ call_bool_check_hook(struct config_bool * conf, bool *newval, void **extra, ereport(elevel, (errcode(GUC_check_errcode_value), GUC_check_errmsg_string ? - errmsg("%s", GUC_check_errmsg_string) : + errmsg_internal("%s", GUC_check_errmsg_string) : errmsg("invalid value for parameter \"%s\": %d", conf->gen.name, (int) *newval), GUC_check_errdetail_string ? - errdetail("%s", GUC_check_errdetail_string) : 0, + errdetail_internal("%s", GUC_check_errdetail_string) : 0, GUC_check_errhint_string ? errhint("%s", GUC_check_errhint_string) : 0)); /* Flush any strings created in ErrorContext */ @@ -8009,11 +8009,11 @@ call_int_check_hook(struct config_int * conf, int *newval, void **extra, ereport(elevel, (errcode(GUC_check_errcode_value), GUC_check_errmsg_string ? - errmsg("%s", GUC_check_errmsg_string) : + errmsg_internal("%s", GUC_check_errmsg_string) : errmsg("invalid value for parameter \"%s\": %d", conf->gen.name, *newval), GUC_check_errdetail_string ? - errdetail("%s", GUC_check_errdetail_string) : 0, + errdetail_internal("%s", GUC_check_errdetail_string) : 0, GUC_check_errhint_string ? errhint("%s", GUC_check_errhint_string) : 0)); /* Flush any strings created in ErrorContext */ @@ -8043,11 +8043,11 @@ call_real_check_hook(struct config_real * conf, double *newval, void **extra, ereport(elevel, (errcode(GUC_check_errcode_value), GUC_check_errmsg_string ? - errmsg("%s", GUC_check_errmsg_string) : + errmsg_internal("%s", GUC_check_errmsg_string) : errmsg("invalid value for parameter \"%s\": %g", conf->gen.name, *newval), GUC_check_errdetail_string ? - errdetail("%s", GUC_check_errdetail_string) : 0, + errdetail_internal("%s", GUC_check_errdetail_string) : 0, GUC_check_errhint_string ? errhint("%s", GUC_check_errhint_string) : 0)); /* Flush any strings created in ErrorContext */ @@ -8077,11 +8077,11 @@ call_string_check_hook(struct config_string * conf, char **newval, void **extra, ereport(elevel, (errcode(GUC_check_errcode_value), GUC_check_errmsg_string ? - errmsg("%s", GUC_check_errmsg_string) : + errmsg_internal("%s", GUC_check_errmsg_string) : errmsg("invalid value for parameter \"%s\": \"%s\"", conf->gen.name, *newval ? *newval : ""), GUC_check_errdetail_string ? - errdetail("%s", GUC_check_errdetail_string) : 0, + errdetail_internal("%s", GUC_check_errdetail_string) : 0, GUC_check_errhint_string ? errhint("%s", GUC_check_errhint_string) : 0)); /* Flush any strings created in ErrorContext */ @@ -8111,12 +8111,12 @@ call_enum_check_hook(struct config_enum * conf, int *newval, void **extra, ereport(elevel, (errcode(GUC_check_errcode_value), GUC_check_errmsg_string ? - errmsg("%s", GUC_check_errmsg_string) : + errmsg_internal("%s", GUC_check_errmsg_string) : errmsg("invalid value for parameter \"%s\": \"%s\"", conf->gen.name, config_enum_lookup_by_value(conf, *newval)), GUC_check_errdetail_string ? - errdetail("%s", GUC_check_errdetail_string) : 0, + errdetail_internal("%s", GUC_check_errdetail_string) : 0, GUC_check_errhint_string ? errhint("%s", GUC_check_errhint_string) : 0)); /* Flush any strings created in ErrorContext */ |