diff options
| author | Bruce Momjian | 2006-07-10 18:40:16 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2006-07-10 18:40:16 +0000 |
| commit | b538215d5d1c5c0675725fe539da26299682136a (patch) | |
| tree | 9d5e3e4abb78a69692c97a3fe32efe7df552c2bc /contrib/fuzzystrmatch | |
| parent | d399f1b75e0550514cdb3654f19c6cd264967b0d (diff) | |
Remove a few baby-C macros in fuzzystrmatch. Add a few missing includes.
Diffstat (limited to 'contrib/fuzzystrmatch')
| -rw-r--r-- | contrib/fuzzystrmatch/fuzzystrmatch.c | 8 | ||||
| -rw-r--r-- | contrib/fuzzystrmatch/fuzzystrmatch.h | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c index 9b12c8f1fd4..7102fee8588 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.c +++ b/contrib/fuzzystrmatch/fuzzystrmatch.c @@ -5,7 +5,7 @@ * * Joe Conway <mail@joeconway.com> * - * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.21 2006/05/30 22:12:13 tgl Exp $ + * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.22 2006/07/10 18:40:16 momjian Exp $ * Copyright (c) 2001-2006, PostgreSQL Global Development Group * ALL RIGHTS RESERVED; * @@ -142,7 +142,7 @@ levenshtein(PG_FUNCTION_ARGS) * position in the source string, matches the character at the * current row position in the target string; cost is 1 otherwise. */ - c = ((CHAREQ(str_s, str_t)) ? 0 : 1); + c = (*str_s != *str_t); /* * c1 is upper right cell plus 1 @@ -167,7 +167,7 @@ levenshtein(PG_FUNCTION_ARGS) /* * Increment the pointer to str_s */ - NextChar(str_s); + str_s++; } /* @@ -181,7 +181,7 @@ levenshtein(PG_FUNCTION_ARGS) /* * Increment the pointer to str_t */ - NextChar(str_t); + str_t++; /* * Rewind the pointer to str_s diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.h b/contrib/fuzzystrmatch/fuzzystrmatch.h index 42f7f1fa30c..a8038d23f38 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.h +++ b/contrib/fuzzystrmatch/fuzzystrmatch.h @@ -5,7 +5,7 @@ * * Joe Conway <mail@joeconway.com> * - * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.h,v 1.13 2006/03/11 04:38:29 momjian Exp $ + * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.h,v 1.14 2006/07/10 18:40:16 momjian Exp $ * Copyright (c) 2001-2006, PostgreSQL Global Development Group * ALL RIGHTS RESERVED; * @@ -81,9 +81,6 @@ static const char *soundex_table = "01230120022455012623010202"; /* * Levenshtein */ -#define STRLEN(p) strlen(p) -#define CHAREQ(p1, p2) (*(p1) == *(p2)) -#define NextChar(p) ((p)++) #define MAX_LEVENSHTEIN_STRLEN 255 |