From: Hallvard Breien Furuseth <h.b.furuseth@usit.uio.no>
Date: Tue, 27 Jan 2015 22:37:46 +0000 (+0100)
Subject: Update wrap_slap_ops.
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=45f5d530d92d604d20c8a35f71965b13e703127a;p=openldap

Update wrap_slap_ops.

Catch a new bi_op_bind[]() case.  Silence warnings in END{}.
---

diff --git a/contrib/slapd-tools/wrap_slap_ops b/contrib/slapd-tools/wrap_slap_ops
index 507d7c1e25..e0981689f7 100755
--- a/contrib/slapd-tools/wrap_slap_ops
+++ b/contrib/slapd-tools/wrap_slap_ops
@@ -63,7 +63,7 @@ sub file_result( $$ ) {
 }
 
 END {
-	print STDERR <<EOMSG;
+	print STDERR <<EOMSG if defined $ccnt;
 $ccnt files to change. $rcnt suspicious lines remain. (Expect three in slapd).
 EOMSG
 }
@@ -95,7 +95,7 @@ s%(	                            # 1: entire match: "<delim><function>("
 
 # (&x->bi_op_bind)[which](op, rs)  ==>  slap_bi_op(x, which, op, rs)
 #    (&x->be_bind)[which](op, rs)  ==>  slap_be_op(x, which, op, rs)
-s/\(&(\w+)->b(?=([ei]))(?:e|i_op)_bind\)\[\s* (\w+) \s*\] \((\s*) ([^()]*)\)
+s/\(&(\w+(?:(?:->|\.)\w+)*)->b(?=([ei]))(?:e|i_op)_bind\)\[\s* (\w+) \s*\] \((\s*) ([^()]*)\)
  /slap_b$2_op($4$1, $3, $5)/gox;
 
 # slap_bi_op(x->bd_info, which, op, rs)  ==>  slap_be_op( x, which, op, rs)