mirror of
https://github.com/postgres/postgres.git
synced 2025-11-10 17:42:29 +03:00
Revert "Convert *GetDatum() and DatumGet*() macros to inline functions"
This reverts commit 595836e99b.
It has problems when USE_FLOAT8_BYVAL is off.
This commit is contained in:
@@ -280,7 +280,7 @@ gistMakeUnionKey(GISTSTATE *giststate, int attno,
|
||||
bool
|
||||
gistKeyIsEQ(GISTSTATE *giststate, int attno, Datum a, Datum b)
|
||||
{
|
||||
bool result = false; /* silence compiler warning */
|
||||
bool result;
|
||||
|
||||
FunctionCall3Coll(&giststate->equalFn[attno],
|
||||
giststate->supportCollation[attno],
|
||||
|
||||
@@ -354,7 +354,7 @@ void
|
||||
parsetext(Oid cfgId, ParsedText *prs, char *buf, int buflen)
|
||||
{
|
||||
int type,
|
||||
lenlemm = 0; /* silence compiler warning */
|
||||
lenlemm;
|
||||
char *lemm = NULL;
|
||||
LexizeData ldata;
|
||||
TSLexeme *norms;
|
||||
@@ -529,7 +529,7 @@ void
|
||||
hlparsetext(Oid cfgId, HeadlineParsedText *prs, TSQuery query, char *buf, int buflen)
|
||||
{
|
||||
int type,
|
||||
lenlemm = 0; /* silence compiler warning */
|
||||
lenlemm;
|
||||
char *lemm = NULL;
|
||||
LexizeData ldata;
|
||||
TSLexeme *norms;
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user