diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-07-16 14:21:12 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-07-16 14:22:18 -0400 |
| commit | 1af37ec96d97722aeb527f5f43d6f6f2304f0861 (patch) | |
| tree | c62658c6f2b199c9a38489b91053f9a17f070a1b /src/backend/utils/misc/guc.c | |
| parent | 3ee7c8710defb63490d90cfff09a773d764aa05d (diff) | |
Replace errdetail("%s", ...) with errdetail_internal("%s", ...).
There may be some other places where we should use errdetail_internal,
but they'll have to be evaluated case-by-case. This commit just hits
a bunch of places where invoking gettext is obviously a waste of cycles.
Diffstat (limited to 'src/backend/utils/misc/guc.c')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 20 |
1 files changed, 10 insertions, 10 deletions
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 */ |