diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pg_stat_statements/pg_stat_statements.c | 8 | ||||
| -rw-r--r-- | contrib/sslinfo/sslinfo.c | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 97f171d68ed..0bd0d046c7a 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -1458,11 +1458,9 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo, { char *enc; - enc = (char *) - pg_do_encoding_conversion((unsigned char *) qstr, - entry->query_len, - entry->encoding, - GetDatabaseEncoding()); + enc = pg_any_to_server(qstr, + entry->query_len, + entry->encoding); values[i++] = CStringGetTextDatum(enc); diff --git a/contrib/sslinfo/sslinfo.c b/contrib/sslinfo/sslinfo.c index d724fe91ff5..90c6b57c699 100644 --- a/contrib/sslinfo/sslinfo.c +++ b/contrib/sslinfo/sslinfo.c @@ -158,10 +158,7 @@ ASN1_STRING_to_text(ASN1_STRING *str) nullterm = '\0'; BIO_write(membuf, &nullterm, 1); size = BIO_get_mem_data(membuf, &sp); - dp = (char *) pg_do_encoding_conversion((unsigned char *) sp, - size - 1, - PG_UTF8, - GetDatabaseEncoding()); + dp = pg_any_to_server(sp, size - 1, PG_UTF8); result = cstring_to_text(dp); if (dp != sp) pfree(dp); @@ -323,10 +320,7 @@ X509_NAME_to_text(X509_NAME *name) nullterm = '\0'; BIO_write(membuf, &nullterm, 1); size = BIO_get_mem_data(membuf, &sp); - dp = (char *) pg_do_encoding_conversion((unsigned char *) sp, - size - 1, - PG_UTF8, - GetDatabaseEncoding()); + dp = pg_any_to_server(sp, size - 1, PG_UTF8); result = cstring_to_text(dp); if (dp != sp) pfree(dp); |