Revert previous commit

[openldap] / servers / slapd / phonetic.c

diff --git a/servers/slapd/phonetic.c b/servers/slapd/phonetic.c
index 240de884a2fe822f1377659aa608897623101812..4934cbd31688b07b83e4379cb76575f79aa9171b 100644 (file)
--- 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;
@@ -157,7 +162,7 @@ phonetic( char *s )
 }
 
 #else
-#if defined(METAPHONE)
+#if defined(SLAPD_METAPHONE)
 
 /*
  * Metaphone copied from C Gazette, June/July 1991, pp 56-57,
@@ -184,9 +189,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;