semicolon after colon in goto labels; no C++ style comments

diff --git a/libraries/librewrite/context.c b/libraries/librewrite/context.c
index 4e527e875a46673207965ea0a21933bcc4f735f5..e32eb8a11d147390b925a3a482d8491583cc6e45 100644 (file)
--- 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 2b8184e15d41b0f9e605e6c392159b9fd59d7668..6a89f3ce43adef9a660aaf0e1a60ea7946b377b5 100644 (file)
--- 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 16db729a0decef05c4ae5c93ffdec26d1d901bcc..6f83ff7aa35d91844ba3907a4bb512b526a6a934 100644 (file)
--- 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 f22bb925870f08a26ac68fb477e843db7ab85469..c40456aa9cc6d5a366c078428fce44392b79d74a 100644 (file)
--- 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 2347383480c56557c2f7f6449f737fa96df9b2ad..84a652daf416634f86360b1fb075566b773a1c26 100644 (file)
--- 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!
                 */