X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fphonetic.c;h=80522af3e753bb15f9e538c6c6b70ed7286167ed;hb=9fbcc90bd5578c85fd1e3d5845a3ef6121cefc7a;hp=27f3f91e546208639f37a9e079622147bf033cf5;hpb=73db912500316a665638e66e0ff442699b03127b;p=openldap

diff --git a/servers/slapd/phonetic.c b/servers/slapd/phonetic.c
index 27f3f91e54..80522af3e7 100644
--- a/servers/slapd/phonetic.c
+++ b/servers/slapd/phonetic.c
@@ -1,4 +1,9 @@
 /* phonetic.c - routines to do phonetic matching */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -11,15 +16,15 @@
 
 #include "slap.h"
 
-#if !defined(METAPHONE) && !defined(SLAPD_PHONETIC)
-#define METAPHONE
+#if !defined(SLAPD_METAPHONE) && !defined(SLAPD_PHONETIC)
+#define SLAPD_METAPHONE
 #endif
 
 #define iswordbreak(x)  (!isascii(x) || isspace((unsigned char) (x)) || \
 			 ispunct((unsigned char) (x)) || \
-			 isdigit((unsigned char) (x)) || x == '\0')
+			 isdigit((unsigned char) (x)) || (x) == '\0')
 
-char *
+static char *
 first_word( char *s )
 {
 	if ( s == NULL ) {
@@ -37,7 +42,7 @@ first_word( char *s )
 	return( s );
 }
 
-char *
+static char *
 next_word( char *s )
 {
 	if ( s == NULL ) {
@@ -59,7 +64,7 @@ next_word( char *s )
 	return( s );
 }
 
-char *
+static char *
 word_dup( char *w )
 {
 	char	*s, *ret;
@@ -87,8 +92,7 @@ phonetic( char *s )
 {
         char	code, adjacent, ch;
 	char	*p;
-	char	**c;
-        int	i, cmax;
+        int	i;
 	char	phoneme[MAXPHONEMELEN + 1];
 
         p = s;
@@ -157,8 +161,7 @@ phonetic( char *s )
         return( ch_strdup( phoneme ) );
 }
 
-#else
-#if defined(METAPHONE)
+#elif defined(SLAPD_METAPHONE)
 
 /*
  * Metaphone copied from C Gazette, June/July 1991, pp 56-57,
@@ -168,7 +171,7 @@ phonetic( char *s )
  */
 
 /* Character coding array */
-static char     vsvfn[26] = {
+static const char  vsvfn[26] = {
 	   1, 16, 4, 16, 9, 2, 4, 16, 9, 2, 0, 2, 2,
 	/* A   B  C   D  E  F  G   H  I  J  K  L  M  */
 	   2, 1, 4, 0, 2, 4, 4, 1, 0, 0, 0, 8, 0};
@@ -185,9 +188,8 @@ char *
 phonetic( char *Word )
 {
 	char           *n, *n_start, *n_end;	/* pointers to string */
-	char           *metaph, *metaph_end;	/* pointers to metaph */
+	char           *metaph_end;	/* pointers to metaph */
 	char            ntrans[40];	/* word with uppercase letters */
-	char            newm[8];/* new metaph for comparison */
 	int             KSflag;	/* state flag for X -> KS */
 	char		buf[MAXPHONEMELEN + 2];
 	char		*Metaph;
@@ -429,5 +431,4 @@ phonetic( char *Word )
 	return( ch_strdup( buf ) );
 }
 
-#endif /* metaphone */
-#endif /* SLAPD_PHONETIC */
+#endif /* SLAPD_METAPHONE */