From a712216a6c1a3ef186f137c1fc591dd013394246 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 3 Jun 2001 08:52:22 +0000
Subject: [PATCH] semicolon after colon in goto labels; no C++ style comments

---
 libraries/librewrite/context.c | 4 ++--
 libraries/librewrite/info.c    | 2 +-
 libraries/librewrite/ldapmap.c | 4 ++--
 libraries/librewrite/map.c     | 2 +-
 libraries/librewrite/rule.c    | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/librewrite/context.c b/libraries/librewrite/context.c
index 4e527e875a..e32eb8a11d 100644
--- a/libraries/librewrite/context.c
+++ b/libraries/librewrite/context.c
@@ -396,11 +396,11 @@ rewrite_context_apply(
 
 		}
 		
-rc_continue:	/* sent here by actions that require to continue */
+rc_continue:;	/* sent here by actions that require to continue */
 
 	}
 
-rc_end_of_context:
+rc_end_of_context:;
 	*result = res;
 
 	Debug( LDAP_DEBUG_TRACE, "==> rewrite_context_apply"
diff --git a/libraries/librewrite/info.c b/libraries/librewrite/info.c
index 2b8184e15d..6a89f3ce43 100644
--- a/libraries/librewrite/info.c
+++ b/libraries/librewrite/info.c
@@ -244,7 +244,7 @@ rewrite_session(
 		}
 	}
 
-rc_return:
+rc_return:;
 	if ( op.lo_vars ) {
 		rewrite_var_delete( op.lo_vars );
 	}
diff --git a/libraries/librewrite/ldapmap.c b/libraries/librewrite/ldapmap.c
index 16db729a0d..6f83ff7aa3 100644
--- a/libraries/librewrite/ldapmap.c
+++ b/libraries/librewrite/ldapmap.c
@@ -250,7 +250,7 @@ map_ldap_apply(
 		goto rc_return;
 	}
 
-do_bind:
+do_bind:;
 	if ( data->binddn != NULL ) {
 		rc = ldap_simple_bind_s( ld, data->binddn, data->bindpw );
 		if ( rc == LDAP_SERVER_DOWN && first_try ) {
@@ -316,7 +316,7 @@ do_bind:
 	}
 	val->bv_len = strlen( val->bv_val );
 
-rc_return:
+rc_return:;
 	if ( data->when == MAP_LDAP_EVERYTIME ) {
 		if ( ld != NULL ) {
 			ldap_unbind_s( ld );
diff --git a/libraries/librewrite/map.c b/libraries/librewrite/map.c
index f22bb92587..c40456aa9c 100644
--- a/libraries/librewrite/map.c
+++ b/libraries/librewrite/map.c
@@ -696,7 +696,7 @@ rewrite_xmap_apply(
 	}
 	}
 
-rc_return:
+rc_return:;
 	return rc;
 }
 
diff --git a/libraries/librewrite/rule.c b/libraries/librewrite/rule.c
index 2347383480..84a652daf4 100644
--- a/libraries/librewrite/rule.c
+++ b/libraries/librewrite/rule.c
@@ -269,7 +269,7 @@ rewrite_rule_compile(
 	 */
 	rule = calloc( sizeof( struct rewrite_rule ), 1 );
 	if ( rule == NULL ) {
-		// charray_free( res );
+		/* charray_free( res ); */
 		/*
 		 * XXX need to free the value subst stuff!
 		 */
@@ -280,7 +280,7 @@ rewrite_rule_compile(
 	 * REGEX compilation (luckily I don't need to take care of this ...)
 	 */
 	if ( regcomp( &rule->lr_regex, ( char * )pattern, flags ) != 0 ) {
-		// charray_free( res );
+		/* charray_free( res ); */
 		/*
 		 *XXX need to free the value subst stuff!
 		 */