mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bruce Momjian 2006-07-10 18:40:16 +00:00
parent d399f1b75e
commit b538215d5d
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/btree_gist/btree_utils_num.h
View File

@ -1,3 +1,4 @@
#include "btree_gist.h"
typedef char GBT_NUMKEY; typedef char GBT_NUMKEY;

2
contrib/btree_gist/btree_utils_var.h
View File

@ -1,5 +1,7 @@
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#include "btree_gist.h"
/* Variable length key */ /* Variable length key */
typedef bytea GBT_VARKEY; typedef bytea GBT_VARKEY;

4
contrib/dblink/dblink.h
View File

@ -8,7 +8,7 @@
* Darko Prenosil <Darko.Prenosil@finteh.hr> * Darko Prenosil <Darko.Prenosil@finteh.hr>
* Shridhar Daithankar <shridhar_daithankar@persistent.co.in> * Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
* *
* $PostgreSQL: pgsql/contrib/dblink/dblink.h,v 1.15 2006/03/11 04:38:29 momjian Exp $ * $PostgreSQL: pgsql/contrib/dblink/dblink.h,v 1.16 2006/07/10 18:40:16 momjian Exp $
* Copyright (c) 2001-2006, PostgreSQL Global Development Group * Copyright (c) 2001-2006, PostgreSQL Global Development Group
* ALL RIGHTS RESERVED; * ALL RIGHTS RESERVED;
* *
@ -34,6 +34,8 @@
#ifndef DBLINK_H #ifndef DBLINK_H
#define DBLINK_H #define DBLINK_H
#include "fmgr.h"
/* /*
* External declarations * External declarations
*/ */

8
contrib/fuzzystrmatch/fuzzystrmatch.c
View File

@ -5,7 +5,7 @@
* *
* Joe Conway <mail@joeconway.com> * 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 * Copyright (c) 2001-2006, PostgreSQL Global Development Group
* ALL RIGHTS RESERVED; * ALL RIGHTS RESERVED;
* *
@ -142,7 +142,7 @@ levenshtein(PG_FUNCTION_ARGS)
* position in the source string, matches the character at the * position in the source string, matches the character at the
* current row position in the target string; cost is 1 otherwise. * 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 * c1 is upper right cell plus 1
@ -167,7 +167,7 @@ levenshtein(PG_FUNCTION_ARGS)
/* /*
* Increment the pointer to str_s * 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 * Increment the pointer to str_t
*/ */
NextChar(str_t); str_t++;
/* /*
* Rewind the pointer to str_s * Rewind the pointer to str_s

5
contrib/fuzzystrmatch/fuzzystrmatch.h
View File

@ -5,7 +5,7 @@
* *
* Joe Conway <mail@joeconway.com> * 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 * Copyright (c) 2001-2006, PostgreSQL Global Development Group
* ALL RIGHTS RESERVED; * ALL RIGHTS RESERVED;
* *
@ -81,9 +81,6 @@ static const char *soundex_table = "01230120022455012623010202";
/* /*
* Levenshtein * Levenshtein
*/ */
#define STRLEN(p) strlen(p)
#define CHAREQ(p1, p2) (*(p1) == *(p2))
#define NextChar(p) ((p)++)
#define MAX_LEVENSHTEIN_STRLEN 255 #define MAX_LEVENSHTEIN_STRLEN 255