From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 28 Jul 2002 07:37:46 +0000 (+0000)
Subject: clean up curly matching
X-Git-Tag: NO_SLAP_OP_BLOCKS~1304
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=182dcf27e269ac40a984b15e9c3594c282d8c45d;p=openldap

clean up curly matching
---

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index ae19ed8480..c99695b603 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -1824,7 +1824,8 @@ string_expand(
 
 	flag = 0;
 	for ( dp = bv->bv_val, sp = pat->bv_val; size < bv->bv_len &&
-		sp < pat->bv_val + pat->bv_len ; sp++) {
+		sp < pat->bv_val + pat->bv_len ; sp++ )
+	{
 		/* did we previously see a $ */
 		if ( flag ) {
 			if ( flag == 1 && *sp == '$' ) {
@@ -1832,7 +1833,7 @@ string_expand(
 				size++;
 				flag = 0;
 
-			} else if ( flag == 1 && *sp == '{') {
+			} else if ( flag == 1 && *sp == '{' /*'}'*/) {
 				flag = 2;
 
 			} else if ( *sp >= '0' && *sp <= '9' ) {
@@ -1843,13 +1844,13 @@ string_expand(
 				n = *sp - '0';
 
 				if ( flag == 2 ) {
-					for ( sp++; *sp != '\0' && *sp != /* { */ '}'; sp++ ) {
+					for ( sp++; *sp != '\0' && *sp != /*'{'*/ '}'; sp++ ) {
 						if ( *sp >= '0' && *sp <= '9' ) {
 							n = 10*n + ( *sp - '0' );
 						}
 					}
 
-					if ( *sp != /* { */ '}' ) {
+					if ( *sp != /*'{'*/ '}' ) {
 						/* error */
 					}
 				}