Commitb538215

committed

Remove a few baby-C macros in fuzzystrmatch. Add a few missing includes.

1 parentd399f1b commitb538215Copy full SHA for b538215

File tree

+11

-9

lines changed

+11

-9

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 2 additions & 0 deletions

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Darko Prenosil <Darko.Prenosil@finteh.hr>`
`9`	`9`	`* Shridhar Daithankar <shridhar_daithankar@persistent.co.in>`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/contrib/dblink/dblink.h,v 1.15 2006/03/11 04:38:29 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/contrib/dblink/dblink.h,v 1.16 2006/07/10 18:40:16 momjian Exp $`
`12`	`12`	`* Copyright (c) 2001-2006, PostgreSQL Global Development Group`
`13`	`13`	`* ALL RIGHTS RESERVED;`
`14`	`14`	`*`
`@@ -34,6 +34,8 @@`
`34`	`34`	`#ifndefDBLINK_H`
`35`	`35`	`#defineDBLINK_H`
`36`	`36`
	`37`	`+#include"fmgr.h"`
	`38`	`+`
`37`	`39`	`/*`
`38`	`40`	`* External declarations`
`39`	`41`	`*/`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Joe Conway <mail@joeconway.com>`
`7`	`7`	`*`
`8`		`- * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.21 2006/05/30 22:12:13 tgl Exp $`
	`8`	`+ * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.22 2006/07/10 18:40:16 momjian Exp $`
`9`	`9`	`* Copyright (c) 2001-2006, PostgreSQL Global Development Group`
`10`	`10`	`* ALL RIGHTS RESERVED;`
`11`	`11`	`*`
`@@ -142,7 +142,7 @@ levenshtein(PG_FUNCTION_ARGS)`
`142`	`142`	`* position in the source string, matches the character at the`
`143`	`143`	`* current row position in the target string; cost is 1 otherwise.`
`144`	`144`	`*/`
`145`		`-c= ((CHAREQ(str_s,str_t)) ?0 :1);`
	`145`	`+c= (str_s!=str_t);`
`146`	`146`
`147`	`147`	`/*`
`148`	`148`	`* c1 is upper right cell plus 1`
`@@ -167,7 +167,7 @@ levenshtein(PG_FUNCTION_ARGS)`
`167`	`167`	`/*`
`168`	`168`	`* Increment the pointer to str_s`
`169`	`169`	`*/`
`170`		`-NextChar(str_s);`
	`170`	`+str_s++;`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`/*`
`@@ -181,7 +181,7 @@ levenshtein(PG_FUNCTION_ARGS)`
`181`	`181`	`/*`
`182`	`182`	`* Increment the pointer to str_t`
`183`	`183`	`*/`
`184`		`-NextChar(str_t);`
	`184`	`+str_t++;`
`185`	`185`
`186`	`186`	`/*`
`187`	`187`	`* Rewind the pointer to str_s`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Joe Conway <mail@joeconway.com>`
`7`	`7`	`*`
`8`		`- * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.h,v 1.13 2006/03/11 04:38:29 momjian Exp $`
	`8`	`+ * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.h,v 1.14 2006/07/10 18:40:16 momjian Exp $`
`9`	`9`	`* Copyright (c) 2001-2006, PostgreSQL Global Development Group`
`10`	`10`	`* ALL RIGHTS RESERVED;`
`11`	`11`	`*`
`@@ -81,9 +81,6 @@ static const char *soundex_table = "01230120022455012623010202";`
`81`	`81`	`/*`
`82`	`82`	`* Levenshtein`
`83`	`83`	`*/`
`84`		`-#defineSTRLEN(p) strlen(p)`
`85`		`-#defineCHAREQ(p1,p2) ((p1) == (p2))`
`86`		`-#defineNextChar(p) ((p)++)`
`87`	`84`	`#defineMAX_LEVENSHTEIN_STRLEN255`
`88`	`85`
`89`	`86`

Comments

(0)