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

diff --git a/servers/slapd/phonetic.c b/servers/slapd/phonetic.c
index 65b2a74804..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;
@@ -156,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,
@@ -427,5 +431,4 @@ phonetic( char *Word )
 	return( ch_strdup( buf ) );
 }
 
-#endif /* metaphone */
-#endif /* SLAPD_PHONETIC */
+#endif /* SLAPD_METAPHONE */