diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2022-09-12 19:57:07 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2022-09-12 19:57:07 +0200 |
| commit | e8d78581bb864369035c736a82ecfb57482a1a09 (patch) | |
| tree | b6881a0046c905ad671e0b43d60a42a119f4a3d4 /src/backend/utils/mb/mbutils.c | |
| parent | 595836e99bf1ee6d43405b885fb69bb8c6d3ee23 (diff) | |
| download | postgresql-e8d78581bb864369035c736a82ecfb57482a1a09.tar.gz | |
Revert "Convert *GetDatum() and DatumGet*() macros to inline functions"
This reverts commit 595836e99bf1ee6d43405b885fb69bb8c6d3ee23.
It has problems when USE_FLOAT8_BYVAL is off.
Diffstat (limited to 'src/backend/utils/mb/mbutils.c')
| -rw-r--r-- | src/backend/utils/mb/mbutils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index 474ab476f5..0543c574c6 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -409,8 +409,8 @@ pg_do_encoding_conversion(unsigned char *src, int len, (void) OidFunctionCall6(proc, Int32GetDatum(src_encoding), Int32GetDatum(dest_encoding), - CStringGetDatum((char *) src), - CStringGetDatum((char *) result), + CStringGetDatum(src), + CStringGetDatum(result), Int32GetDatum(len), BoolGetDatum(false)); @@ -485,8 +485,8 @@ pg_do_encoding_conversion_buf(Oid proc, result = OidFunctionCall6(proc, Int32GetDatum(src_encoding), Int32GetDatum(dest_encoding), - CStringGetDatum((char *) src), - CStringGetDatum((char *) dest), + CStringGetDatum(src), + CStringGetDatum(dest), Int32GetDatum(srclen), BoolGetDatum(noError)); return DatumGetInt32(result); @@ -910,8 +910,8 @@ pg_unicode_to_server(pg_wchar c, unsigned char *s) FunctionCall6(Utf8ToServerConvProc, Int32GetDatum(PG_UTF8), Int32GetDatum(server_encoding), - CStringGetDatum((char *) c_as_utf8), - CStringGetDatum((char *) s), + CStringGetDatum(c_as_utf8), + CStringGetDatum(s), Int32GetDatum(c_as_utf8_len), BoolGetDatum(false)); } |