7
7
*
8
8
*
9
9
* IDENTIFICATION
10
- * $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.12 2008/05/16 16:31:01 tgl Exp $
10
+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.13 2008/12/02 11:30:53 heikki Exp $
11
11
*
12
12
*-------------------------------------------------------------------------
13
13
*/
22
22
Datum
23
23
gin_cmp_tslexeme (PG_FUNCTION_ARGS )
24
24
{
25
- text * a = PG_GETARG_TEXT_P (0 );
26
- text * b = PG_GETARG_TEXT_P (1 );
25
+ text * a = PG_GETARG_TEXT_PP (0 );
26
+ text * b = PG_GETARG_TEXT_PP (1 );
27
27
int cmp ;
28
28
29
29
cmp = tsCompareString (
30
- VARDATA (a ), VARSIZE (a ) - VARHDRSZ ,
31
- VARDATA (b ), VARSIZE (b ) - VARHDRSZ ,
30
+ VARDATA_ANY (a ), VARSIZE_ANY_EXHDR (a ),
31
+ VARDATA_ANY (b ), VARSIZE_ANY_EXHDR (b ),
32
32
false );
33
33
34
34
PG_FREE_IF_COPY (a ,0 );
@@ -39,16 +39,16 @@ gin_cmp_tslexeme(PG_FUNCTION_ARGS)
39
39
Datum
40
40
gin_cmp_prefix (PG_FUNCTION_ARGS )
41
41
{
42
- text * a = PG_GETARG_TEXT_P (0 );
43
- text * b = PG_GETARG_TEXT_P (1 );
42
+ text * a = PG_GETARG_TEXT_PP (0 );
43
+ text * b = PG_GETARG_TEXT_PP (1 );
44
44
#ifdef NOT_USED
45
45
StrategyNumber strategy = PG_GETARG_UINT16 (2 );
46
46
#endif
47
47
int cmp ;
48
48
49
49
cmp = tsCompareString (
50
- VARDATA (a ), VARSIZE (a ) - VARHDRSZ ,
51
- VARDATA (b ), VARSIZE (b ) - VARHDRSZ ,
50
+ VARDATA_ANY (a ), VARSIZE_ANY_EXHDR (a ),
51
+ VARDATA_ANY (b ), VARSIZE_ANY_EXHDR (b ),
52
52
true );
53
53
54
54
if ( cmp < 0 )
0 commit comments