git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/contrib/tsearch2/dict.c b/contrib/tsearch2/dict.c

index 9ceb78ffb8377bcd1eea1b6c9100ee47168fc6f9..8bfeb96de2538422d09652789af6ba9019a38d9b 100644 (file)

--- a/contrib/tsearch2/dict.c

+++ b/contrib/tsearch2/dict.c

void

init_dict(Oid id, DictInfo * dict)

{

- Oid arg[1] = {OIDOID};

+ Oid arg[1];

bool isnull;

- Datum pars[1] = {ObjectIdGetDatum(id)};

+ Datum pars[1];

int stat;

+ arg[0] = OIDOID;

+ pars[0] = ObjectIdGetDatum(id);

+

memset(dict, 0, sizeof(DictInfo));

SPI_connect();

if (!plan_getdict)

Oid

name2id_dict(text *name)

{

- Oid arg[1] = {TEXTOID};

+ Oid arg[1];

bool isnull;

- Datum pars[1] = {PointerGetDatum(name)};

+ Datum pars[1];

int stat;

Oid id = findSNMap_t(&(DList.name2id_map), name);

+ arg[0] = TEXTOID;

+ pars[0] = PointerGetDatum(name);

+

if (id)

return id;

diff --git a/contrib/tsearch2/ispell/spell.c b/contrib/tsearch2/ispell/spell.c

index 4f4b332933d8b1c2eff7a6306d34c66b1966bf7d..838d9957028c883fc2d177af0bb5717d604b4f74 100644 (file)

--- a/contrib/tsearch2/ispell/spell.c

+++ b/contrib/tsearch2/ispell/spell.c

int level=(snode) ? minpos : startpos; /* recursive minpos==level*/

int lenaff;

CMPDAffix *caff;

- char notprobed[wordlen];

+ char *notprobed;

+ notprobed = (char *) palloc(wordlen);

memset(notprobed,1,wordlen);

var = CopyVar(orig,1);

/* well, it was last word */

var->stem[ var->nstem ] = strnduplicate(word + startpos, wordlen - startpos);

var->nstem++;

+ pfree(notprobed);

return var;

} else {

/* then we will search more big word at the same point */

var->stem[ var->nstem ] = strnduplicate(word + startpos, wordlen - startpos);

var->nstem++;

+ pfree(notprobed);

return var;

}

diff --git a/contrib/tsearch2/rank.c b/contrib/tsearch2/rank.c

index 5b62c9810bce9de5c8a27e2f2d52cde3ae4e9730..a79444250da6e37ea7dbea863c5cd70e09ad82df 100644 (file)

--- a/contrib/tsearch2/rank.c

+++ b/contrib/tsearch2/rank.c

if (*p <= *q)

{

- ChkDocR ch = {f, (doc + lastpos) - f + 1};

+ ChkDocR ch;

+ ch.doc = f;

+ ch.len = (doc + lastpos) - f + 1;

*pos = f - doc + 1;

if (TS_execute(GETQUERY(query), &ch, false, checkcondition_DR))

{

diff --git a/contrib/tsearch2/snmap.c b/contrib/tsearch2/snmap.c

index 2cd3f53e4970939a6f0c7ea96d157544c94de155..ec7ef69a79af2825470b6bde44f11ecf332d7b02 100644 (file)

--- a/contrib/tsearch2/snmap.c

+++ b/contrib/tsearch2/snmap.c

findSNMap(SNMap * map, char *key)

{

SNMapEntry *ptr;

- SNMapEntry ks = {key, 0};

+ SNMapEntry ks;

+

+ ks.key = key;

+ ks.value = 0;

if (map->len == 0 || !map->list)

return 0;

diff --git a/contrib/tsearch2/ts_cfg.c b/contrib/tsearch2/ts_cfg.c

index 0898b9192400b576ffaa59306b5d76b39eb6376b..fd5f7e1556784a4f4e3bb180316be9ba2a7558df 100644 (file)

--- a/contrib/tsearch2/ts_cfg.c

+++ b/contrib/tsearch2/ts_cfg.c

void

init_cfg(Oid id, TSCfgInfo * cfg)

{

- Oid arg[2] = {OIDOID, OIDOID};

+ Oid arg[2];

bool isnull;

- Datum pars[2] = {ObjectIdGetDatum(id), ObjectIdGetDatum(id)};

+ Datum pars[2];

int stat,

i,

j;

text *prsname = NULL;

MemoryContext oldcontext;

+ arg[0] = OIDOID;

+ arg[1] = OIDOID;

+ pars[0] = ObjectIdGetDatum(id);

+ pars[1] = ObjectIdGetDatum(id);

+

memset(cfg, 0, sizeof(TSCfgInfo));

SPI_connect();

if (!plan_getcfg)

Oid

name2id_cfg(text *name)

{

- Oid arg[1] = {TEXTOID};

+ Oid arg[1];

bool isnull;

- Datum pars[1] = {PointerGetDatum(name)};

+ Datum pars[1];

int stat;

Oid id = findSNMap_t(&(CList.name2id_map), name);

+ arg[0] = TEXTOID;

+ pars[0] = PointerGetDatum(name);

+

if (id)

return id;

diff --git a/contrib/tsearch2/wparser.c b/contrib/tsearch2/wparser.c

index 9c3c4430480d2329596c10c5d6d45de3a9de43c9..b97b158ca70b09bb12a6ab10142d603b9ec95fdd 100644 (file)

--- a/contrib/tsearch2/wparser.c

+++ b/contrib/tsearch2/wparser.c

void

init_prs(Oid id, WParserInfo * prs)

{

- Oid arg[1] = {OIDOID};

+ Oid arg[1];

bool isnull;

- Datum pars[1] = {ObjectIdGetDatum(id)};

+ Datum pars[1];

int stat;

+ arg[0] = OIDOID;

+ pars[0] = ObjectIdGetDatum(id);

+

memset(prs, 0, sizeof(WParserInfo));

SPI_connect();

if (!plan_getparser)

Oid

name2id_prs(text *name)

{

- Oid arg[1] = {TEXTOID};

+ Oid arg[1];

bool isnull;

- Datum pars[1] = {PointerGetDatum(name)};

+ Datum pars[1];

int stat;

Oid id = findSNMap_t(&(PList.name2id_map), name);

+ arg[0] = TEXTOID;

+ pars[0] = PointerGetDatum(name);

+

if (id)

return id;

-

SPI_connect();

if (!plan_name2id)

{

diff --git a/contrib/tsearch2/wparser_def.c b/contrib/tsearch2/wparser_def.c

index 6e8775063af1bdba311f64f3522a53681e500173..99b47196e9bfb9c436fb87761728a8bb8f7f1fa7 100644 (file)

--- a/contrib/tsearch2/wparser_def.c

+++ b/contrib/tsearch2/wparser_def.c

if (*p <= *q)

{

- hlCheck ch = {&(prs->words[*p]), *q - *p + 1};

+ hlCheck ch;

+ ch.words = &(prs->words[*p]);

+ ch.len = *q - *p + 1;

if (TS_execute(GETQUERY(query), &ch, false, checkcondition_HL))

return true;

else