From b8b0927455e837e3fdf9c60da17c39cd1405e908 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 6 Jan 2005 23:08:30 +0000 Subject: r4578: Minor cleanup of ndr_pull_array() and ndr_pull_array_foo() regexps. (This used to be commit 0f8f0de00fa687920c898a56238cd3e21d83cfb1) --- source4/build/pidl/eparser.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/build') diff --git a/source4/build/pidl/eparser.pm b/source4/build/pidl/eparser.pm index 83dc90408e..0549bdfdef 100644 --- a/source4/build/pidl/eparser.pm +++ b/source4/build/pidl/eparser.pm @@ -435,9 +435,9 @@ sub RewriteC($$$) # Add tree argument to ndr_pull_array() - s/(ndr_pull_array([^\(_]*?)\(ndr, (NDR_[^,]*?), ([^\)].*?)\);)/ndr_pull_array$2( ndr, $3, tree, $4);/smg; + s/(ndr_pull_array\(ndr, ([^,]*?), ([^\)].*?)\);)/ndr_pull_array( ndr, $2, tree, $3);/smg; - s/(ndr_pull_array_([^\(]*?)\(ndr, (NDR_[^,]*?), (r->((in|out).)?([^,]*?)), (.*?)\);)/ndr_pull_array_$2( ndr, $3, tree, hf_$7_$2_array, $4, $8);/smg; + s/(ndr_pull_array_([^\(]*?)\(ndr, ([^,]*?), (r->((in|out).)?([^,]*?)), (.*?)\);)/ndr_pull_array_$2( ndr, $3, tree, hf_$7_$2_array, $4, $8);/smg; # Save ndr_pull_relative[12]() calls from being wrapped by the # proceeding regexp. -- cgit