semicolon after colon in goto labels; no C++ style comments; unused vars removed...

diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index 1d5b0952343c45577f646fda2c92c638c0bf979e..5e46ad2c2bca98ba00904b668b16421d68f17ec5 100644 (file)
--- a/servers/slapd/back-meta/add.c
+++ b/servers/slapd/back-meta/add.c
@@ -95,7 +95,7 @@ meta_back_add(
        LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY, "meta_back_add: %s\n",
                        e->e_dn ));
 #else /* !NEW_LOGGING */
-       Debug(LDAP_DEBUG_ARGS, "==> meta_back_add: %s\n", e->e_dn, 0, 0);
+       Debug(LDAP_DEBUG_ARGS, "==> meta_back_add: %s\n%s%s", e->e_dn, "", "");
 #endif /* !NEW_LOGGING */
 
        /*

diff --git a/servers/slapd/back-meta/attribute.c b/servers/slapd/back-meta/attribute.c
index 46c46233525765eba0753ca2033101c3388a5a27..f270bed4a192fa9e6487e4a052ec4756c16e8eac 100644 (file)
--- a/servers/slapd/back-meta/attribute.c
+++ b/servers/slapd/back-meta/attribute.c
@@ -102,7 +102,6 @@ meta_back_attribute(
        LDAPMessage     *result, *e;
        char *gattr[ 2 ];
        LDAP *ld;
-       char *me_ndn;
 
        *vals = NULL;
        if ( target != NULL && strcmp( target->e_ndn, e_ndn ) == 0 ) {

diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index 8a5a31cb43e5f538dde7f8d8b3ad6e930ae74d47..12cf49ed602c5fddd18c7b4eb5a987fdff17886f 100644 (file)
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -281,7 +281,7 @@ meta_back_compare(
                }
        }
 
-finish:
+finish:;
 
        /*
         * Rewrite the matched portion of the search base, if required
@@ -342,7 +342,7 @@ finish:
 
        send_ldap_result( conn, op, rres, mmatch, err, NULL, NULL );
 
-cleanup:
+cleanup:;
        if ( match != NULL ) {
                if ( mmatch != match ) {
                        free( mmatch );

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index b19134db7b26f0bdc2b68743d6867b81fa6f94fd..35041ffe34a8d46b606451d5ee05d794159906d0 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -137,7 +137,10 @@ meta_back_db_config(
 
        /* URI of server to query */
        if ( strcasecmp( argv[ 0 ], "uri" ) == 0 ) {
-               int j, i = li->ntargets;
+               int i = li->ntargets;
+#if 0
+               int j;
+#endif /* uncomment if uri MUST be a branch of suffix */
                LDAPURLDesc *ludp;
                char *last;
                

diff --git a/servers/slapd/back-meta/group.c b/servers/slapd/back-meta/group.c
index 7b354a13cc9bd18e8d3dff9791697c9f96bae45f..3fd884208e6bb7b49074a8118ed67b615b33b538 100644 (file)
--- a/servers/slapd/back-meta/group.c
+++ b/servers/slapd/back-meta/group.c
@@ -267,7 +267,7 @@ meta_back_group(
                ldap_msgfree( result );
        }
 
-cleanup:
+cleanup:;
        if ( ld != NULL ) {
                ldap_unbind( ld );
        }

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 61d68e905736c5fa45657d71f956a49c35835eb0..0820bfdf469602bea8939482d802f21e44313a6a 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -201,8 +201,10 @@ meta_back_search(
                                 */
                                lsc[ 0 ]->candidate = META_NOT_CANDIDATE;
                                continue;
-                               // rc = meta_back_op_result(lc, op);
-                               // goto finish;
+                               /*
+                               rc = meta_back_op_result(lc, op);
+                               goto finish;
+                                */
                        }
 
                }
@@ -474,7 +476,7 @@ meta_back_search(
        send_search_result( conn, op, sres,
                mmatch, err, NULL, NULL, count );
 
-finish:
+finish:;
        if ( match ) {
                if ( mmatch != match ) {
                        free( mmatch );