rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fuzzystrmatch: Remove dead code 

Remnants left behind by a323ede280

Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
Reviewed-by: Ryan Murphy <ryanfmurphy@gmail.com>
This commit is contained in:
Peter Eisentraut 2017-08-17 12:39:20 -04:00
parent 90627cf98a
commit 5a739e7b2c
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
contrib/fuzzystrmatch/fuzzystrmatch.c
View File

@ -94,18 +94,6 @@ soundex_code(char letter)
****************************************************************************/ ****************************************************************************/
/**************************************************************************
my constants -- constants I like
Probably redundant.
***************************************************************************/
#define META_ERROR FALSE
#define META_SUCCESS TRUE
#define META_FAILURE FALSE
/* I add modifications to the traditional metaphone algorithm that you /* I add modifications to the traditional metaphone algorithm that you
might find in books. Define this if you want metaphone to behave might find in books. Define this if you want metaphone to behave
traditionally */ traditionally */
@ -116,7 +104,7 @@ soundex_code(char letter)
#define TH '0' #define TH '0'
static char Lookahead(char *word, int how_far); static char Lookahead(char *word, int how_far);
static int _metaphone(char *word, int max_phonemes, char **phoned_word); static void _metaphone(char *word, int max_phonemes, char **phoned_word);
/* Metachar.h ... little bits about characters for metaphone */ /* Metachar.h ... little bits about characters for metaphone */
@ -272,7 +260,6 @@ metaphone(PG_FUNCTION_ARGS)
size_t str_i_len = strlen(str_i); size_t str_i_len = strlen(str_i);
int reqlen; int reqlen;
char *metaph; char *metaph;
int retval;
/* return an empty string if we receive one */ /* return an empty string if we receive one */
if (!(str_i_len > 0)) if (!(str_i_len > 0))
@ -296,17 +283,8 @@ metaphone(PG_FUNCTION_ARGS)
(errcode(ERRCODE_ZERO_LENGTH_CHARACTER_STRING), (errcode(ERRCODE_ZERO_LENGTH_CHARACTER_STRING),
errmsg("output cannot be empty string"))); errmsg("output cannot be empty string")));
_metaphone(str_i, reqlen, &metaph);
retval = _metaphone(str_i, reqlen, &metaph); PG_RETURN_TEXT_P(cstring_to_text(metaph));
if (retval == META_SUCCESS)
PG_RETURN_TEXT_P(cstring_to_text(metaph));
else
{
/* internal error */
elog(ERROR, "metaphone: failure");
/* keep the compiler quiet */
PG_RETURN_NULL();
}
} }
@ -362,7 +340,7 @@ Lookahead(char *word, int how_far)
#define Isbreak(c) (!isalpha((unsigned char) (c))) #define Isbreak(c) (!isalpha((unsigned char) (c)))
static int static void
_metaphone(char *word, /* IN */ _metaphone(char *word, /* IN */
int max_phonemes, int max_phonemes,
char **phoned_word) /* OUT */ char **phoned_word) /* OUT */
@ -404,7 +382,7 @@ _metaphone(char *word, /* IN */
if (Curr_Letter == '\0') if (Curr_Letter == '\0')
{ {
End_Phoned_Word; End_Phoned_Word;
return META_SUCCESS; /* For testing */ return;
} }
} }
@ -721,7 +699,7 @@ _metaphone(char *word, /* IN */
End_Phoned_Word; End_Phoned_Word;
return (META_SUCCESS); return;
} /* END metaphone */ } /* END metaphone */