Fix up abandon merge. Hallvard will holler if I get this wrong. :-)

[openldap] / libraries / librewrite / rewrite.c

diff --git a/libraries/librewrite/rewrite.c b/libraries/librewrite/rewrite.c
index 6097b61f71cde699ebeed99f17ec87a2c0a83f89..586b50c91016265f5e2984f19036639cd78dbd0d 100644 (file)
--- a/libraries/librewrite/rewrite.c
+++ b/libraries/librewrite/rewrite.c
@@ -39,12 +39,6 @@ int ldap_debug;
 int ldap_syslog;
 int ldap_syslog_level;
 
-extern int
-read_rewrite(
-               FILE *fin,
-               struct rewrite_info *info
-);
-
 char *
 apply( 
                FILE *fin, 
@@ -59,7 +53,7 @@ apply(
 
        info = rewrite_info_init(REWRITE_MODE_ERR);
 
-       if ( read_rewrite( fin, info ) != 0 ) {
+       if ( rewrite_read( fin, info ) != 0 ) {
                exit( EXIT_FAILURE );
        }
 
@@ -76,7 +70,7 @@ apply(
                        sep[ 0 ] = '\0';
                        sep++;
                }
-               // rc = rewrite( info, rewriteContext, string, &result );
+               /* rc = rewrite( info, rewriteContext, string, &result ); */
                rc = rewrite_session( info, rewriteContext, string,
                                cookie, &result );