postgrespro
diff --git a/‎contrib/tsearch2/dict_ispell.c
Lines changed: 6 additions & 6 deletions b/‎contrib/tsearch2/dict_ispell.c
Lines changed: 6 additions & 6 deletions
@@ -27,7 +27,7 @@ Datum		spell_lexize(PG_FUNCTION_ARGS);
 static void
 freeDictISpell(DictISpell * d)
 {
-	FreeIspell(&(d->obj));
+	NIFree(&(d->obj));
 	freestoplist(&(d->stoplist));
 	free(d);
 }
@@ -71,7 +71,7 @@ spell_init(PG_FUNCTION_ARGS)
 					  (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 					   errmsg("dictionary already loaded")));
 			}
-			if (ImportDictionary(&(d->obj), pcfg->value))
+			if (NIImportDictionary(&(d->obj), pcfg->value))
 			{
 				freeDictISpell(d);
 				ereport(ERROR,
@@ -90,7 +90,7 @@ spell_init(PG_FUNCTION_ARGS)
 					  (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 					   errmsg("affixes already loaded")));
 			}
-			if (ImportAffixes(&(d->obj), pcfg->value))
+			if (NIImportAffixes(&(d->obj), pcfg->value))
 			{
 				freeDictISpell(d);
 				ereport(ERROR,
@@ -132,8 +132,8 @@ spell_init(PG_FUNCTION_ARGS)
 
 	if (affloaded && dictloaded)
 	{
-		SortDictionary(&(d->obj));
-		SortAffixes(&(d->obj));
+		NISortDictionary(&(d->obj));
+		NISortAffixes(&(d->obj));
 	}
 	else if (!affloaded)
 	{
@@ -168,7 +168,7 @@ spell_lexize(PG_FUNCTION_ARGS)
 
 	res = palloc(sizeof(char *) * 2);
 	txt = pnstrdup(in, PG_GETARG_INT32(2));
-	res = NormalizeWord(&(d->obj), txt);
+	res = NINormalizeWord(&(d->obj), txt);
 	pfree(txt);
 
 	if (res == NULL)
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ Datum spell_lexize(PG_FUNCTION_ARGS);`
`27`	`27`	`static void`
`28`	`28`	`freeDictISpell(DictISpell * d)`
`29`	`29`	`{`
`30`		`- FreeIspell(&(d->obj));`
	`30`	`+ NIFree(&(d->obj));`
`31`	`31`	`freestoplist(&(d->stoplist));`
`32`	`32`	`free(d);`
`33`	`33`	`}`
`@@ -71,7 +71,7 @@ spell_init(PG_FUNCTION_ARGS)`
`71`	`71`	`(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
`72`	`72`	`errmsg("dictionary already loaded")));`
`73`	`73`	`}`
`74`		`- if (ImportDictionary(&(d->obj), pcfg->value))`
	`74`	`+ if (NIImportDictionary(&(d->obj), pcfg->value))`
`75`	`75`	`{`
`76`	`76`	`freeDictISpell(d);`
`77`	`77`	`ereport(ERROR,`
`@@ -90,7 +90,7 @@ spell_init(PG_FUNCTION_ARGS)`
`90`	`90`	`(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
`91`	`91`	`errmsg("affixes already loaded")));`
`92`	`92`	`}`
`93`		`- if (ImportAffixes(&(d->obj), pcfg->value))`
	`93`	`+ if (NIImportAffixes(&(d->obj), pcfg->value))`
`94`	`94`	`{`
`95`	`95`	`freeDictISpell(d);`
`96`	`96`	`ereport(ERROR,`
`@@ -132,8 +132,8 @@ spell_init(PG_FUNCTION_ARGS)`
`132`	`132`
`133`	`133`	`if (affloaded && dictloaded)`
`134`	`134`	`{`
`135`		`- SortDictionary(&(d->obj));`
`136`		`- SortAffixes(&(d->obj));`
	`135`	`+ NISortDictionary(&(d->obj));`
	`136`	`+ NISortAffixes(&(d->obj));`
`137`	`137`	`}`
`138`	`138`	`else if (!affloaded)`
`139`	`139`	`{`
`@@ -168,7 +168,7 @@ spell_lexize(PG_FUNCTION_ARGS)`
`168`	`168`
`169`	`169`	`res = palloc(sizeof(char ) 2);`
`170`	`170`	`txt = pnstrdup(in, PG_GETARG_INT32(2));`
`171`		`- res = NormalizeWord(&(d->obj), txt);`
	`171`	`+ res = NINormalizeWord(&(d->obj), txt);`
`172`	`172`	`pfree(txt);`
`173`	`173`
`174`	`174`	`if (res == NULL)`