X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fphonetic.c;h=38cd8893aece44aaf5c9f7e33d87049dd900f52b;hb=51c5916149f3652345905f21a6c79dd23ab32fb0;hp=5d58ca0a35732eb7aa9841420c40c79d635d1136;hpb=403f4479bc9f9a864122d4aeecf7284408918302;p=openldap
diff --git a/servers/slapd/phonetic.c b/servers/slapd/phonetic.c
index 5d58ca0a35..38cd8893ae 100644
--- a/servers/slapd/phonetic.c
+++ b/servers/slapd/phonetic.c
@@ -1,8 +1,27 @@
/* phonetic.c - routines to do phonetic matching */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
*/
#include "portable.h"
@@ -16,15 +35,16 @@
#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')
-char *
+#if 0
+static char *
first_word( char *s )
{
if ( s == NULL ) {
@@ -42,7 +62,7 @@ first_word( char *s )
return( s );
}
-char *
+static char *
next_word( char *s )
{
if ( s == NULL ) {
@@ -64,7 +84,7 @@ next_word( char *s )
return( s );
}
-char *
+static char *
word_dup( char *w )
{
char *s, *ret;
@@ -79,6 +99,7 @@ word_dup( char *w )
return( ret );
}
+#endif /* 0 */
#ifndef MAXPHONEMELEN
#define MAXPHONEMELEN 4
@@ -161,9 +182,12 @@ phonetic( char *s )
return( ch_strdup( phoneme ) );
}
-#else
-#if defined(METAPHONE)
+#elif defined(SLAPD_METAPHONE)
+/*
+ * Metaphone was originally developed by Lawrence Philips and
+ * published in the "Computer Language" magazine in 1990.
+ */
/*
* Metaphone copied from C Gazette, June/July 1991, pp 56-57,
* author Gary A. Parker, with changes by Bernard Tiffany of the
@@ -432,5 +456,4 @@ phonetic( char *Word )
return( ch_strdup( buf ) );
}
-#endif /* metaphone */
-#endif /* SLAPD_PHONETIC */
+#endif /* SLAPD_METAPHONE */