summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-01-06 23:08:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:29 -0500
commitb8b0927455e837e3fdf9c60da17c39cd1405e908 (patch)
treee1e065e8ede015c3a1b556b077c0405829704ed5 /source4
parent12d8b02f441eb4d8e70b2164ea4636796777becb (diff)
downloadsamba-b8b0927455e837e3fdf9c60da17c39cd1405e908.tar.gz
samba-b8b0927455e837e3fdf9c60da17c39cd1405e908.tar.bz2
samba-b8b0927455e837e3fdf9c60da17c39cd1405e908.zip
r4578: Minor cleanup of ndr_pull_array() and ndr_pull_array_foo() regexps.
(This used to be commit 0f8f0de00fa687920c898a56238cd3e21d83cfb1)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/pidl/eparser.pm4
1 files changed, 2 insertions, 2 deletions
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.