mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
Use new cstring/text conversion functions in some additional places.
These changes assume that the varchar and xml data types are represented the same as text. (I did not, however, accept the portions of the proposed patch that wanted to assume bytea is the same as text --- tgl.) Brendan Jurd
This commit is contained in:
@ -39,8 +39,9 @@ PG_FUNCTION_INFO_V1(xslt_process);
|
||||
Datum
|
||||
xslt_process(PG_FUNCTION_ARGS)
|
||||
{
|
||||
|
||||
|
||||
text *doct = PG_GETARG_TEXT_P(0);
|
||||
text *ssheet = PG_GETARG_TEXT_P(1);
|
||||
text *paramstr;
|
||||
const char *params[MAXPARAMS + 1]; /* +1 for the terminator */
|
||||
xsltStylesheetPtr stylesheet = NULL;
|
||||
xmlDocPtr doctree;
|
||||
@ -50,12 +51,6 @@ xslt_process(PG_FUNCTION_ARGS)
|
||||
int resstat;
|
||||
int reslen;
|
||||
|
||||
text *doct = PG_GETARG_TEXT_P(0);
|
||||
text *ssheet = PG_GETARG_TEXT_P(1);
|
||||
text *paramstr;
|
||||
text *tres;
|
||||
|
||||
|
||||
if (fcinfo->nargs == 3)
|
||||
{
|
||||
paramstr = PG_GETARG_TEXT_P(2);
|
||||
@ -124,11 +119,7 @@ xslt_process(PG_FUNCTION_ARGS)
|
||||
if (resstat < 0)
|
||||
PG_RETURN_NULL();
|
||||
|
||||
tres = palloc(reslen + VARHDRSZ);
|
||||
memcpy(VARDATA(tres), resstr, reslen);
|
||||
SET_VARSIZE(tres, reslen + VARHDRSZ);
|
||||
|
||||
PG_RETURN_TEXT_P(tres);
|
||||
PG_RETURN_TEXT_P(cstring_to_text_with_len(resstr, reslen));
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user