From 14c425b9225d413d33657d680d7f4a70412cdbaf Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 15 Mar 2008 18:16:21 +0000 Subject: [PATCH] s/leave/func_leave/ (ITS#5411) --- servers/slapd/back-ldap/bind.c | 4 ++-- servers/slapd/schema_init.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c index ae513a4e38..a5ac722314 100644 --- a/servers/slapd/back-ldap/bind.c +++ b/servers/slapd/back-ldap/bind.c @@ -1480,7 +1480,7 @@ retry:; } rc = 0; - goto leave; + goto func_leave; } rc = ldap_back_op_result( lc, op, rs, msgid, @@ -1499,7 +1499,7 @@ done:; ldap_set_rebind_proc( lc->lc_ld, li->li_rebind_f, lc ); } -leave:; +func_leave:; if ( op->o_callback == &cb ) op->o_callback = cb.sc_next; op->o_tag = o_tag; diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index c345065d3b..ab82c9df50 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -2239,10 +2239,10 @@ integerIndexer( } rc = integerVal2Key( &values[i], &keys[i], &itmp, ctx ); if ( rc ) - goto leave; + goto func_leave; } *keysp = keys; -leave: +func_leave: if ( itmp.bv_val != ibuf ) { slap_sl_free( itmp.bv_val, ctx ); } @@ -3142,7 +3142,7 @@ serialNumberAndIssuerNormalize( sn2.bv_len = sn.bv_len; if ( lutil_str2bin( &sn, &sn2, ctx )) { rc = LDAP_INVALID_SYNTAX; - goto leave; + goto func_leave; } /* make room for sn + "$" */ @@ -3154,7 +3154,7 @@ serialNumberAndIssuerNormalize( out->bv_len = 0; slap_sl_free( ni.bv_val, ctx ); rc = LDAP_OTHER; - goto leave; + goto func_leave; } n = 0; @@ -3192,7 +3192,7 @@ serialNumberAndIssuerNormalize( Debug( LDAP_DEBUG_TRACE, "<<< serialNumberAndIssuerNormalize: <%s>\n", out->bv_val, 0, 0 ); -leave: +func_leave: if ( stmp != sbuf ) slap_sl_free( stmp, ctx ); slap_sl_free( ni.bv_val, ctx ); -- 2.39.5