From 970abe26372b5fecd7b7534b44556c05f713d58f Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 3 Jun 2001 08:55:17 +0000
Subject: [PATCH] semicolon after colon in goto labels; no C++ style comments;
 unused vars removed or #ifdef'd

---
 servers/slapd/back-meta/add.c       | 2 +-
 servers/slapd/back-meta/attribute.c | 1 -
 servers/slapd/back-meta/compare.c   | 4 ++--
 servers/slapd/back-meta/config.c    | 5 ++++-
 servers/slapd/back-meta/group.c     | 2 +-
 servers/slapd/back-meta/search.c    | 8 +++++---
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index 1d5b095234..5e46ad2c2b 100644
--- 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 46c4623352..f270bed4a1 100644
--- 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 8a5a31cb43..12cf49ed60 100644
--- 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 b19134db7b..35041ffe34 100644
--- 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 7b354a13cc..3fd884208e 100644
--- 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 61d68e9057..0820bfdf46 100644
--- 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 );
-- 
2.39.5