diff options
| author | Tim Potter <tpot@samba.org> | 2005-01-26 05:24:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:13 -0500 |
| commit | 6026daeec963c7e0d2fbe3f46acd543fb0e961a2 (patch) | |
| tree | ee7654308ed8fe24b75d498824e0b45dc64299c1 /source4 | |
| parent | bc9e00c7c4c75953d234dc2b63ec3948e6c351e5 (diff) | |
| download | samba-6026daeec963c7e0d2fbe3f46acd543fb0e961a2.tar.gz samba-6026daeec963c7e0d2fbe3f46acd543fb0e961a2.tar.bz2 samba-6026daeec963c7e0d2fbe3f46acd543fb0e961a2.zip | |
r5007: Fix bug in regexp where we were eating the strings "in" or "out" from
structure names if they started with those strings.
(This used to be commit e983de6ead6ed23b51c2df70e69586b1e7be5a60)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/pidl/eparser.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/pidl/eparser.pm b/source4/build/pidl/eparser.pm index cf2f6a4d54..25b09febb8 100644 --- a/source4/build/pidl/eparser.pm +++ b/source4/build/pidl/eparser.pm @@ -698,8 +698,8 @@ sub RewriteC($$$) s/(ndr_pull_([^\)]*?)\( ndr,\ (NDR_[^,]*?),\ - (&?r->(in|out|)\.?([^\(].*?))\);) - /ndr_pull_$2(ndr, $3, get_subtree(tree, \"$6\", ndr, ett_$2), $4); + (&?r->((in|out)\.)?([^\(].*?))\);) + /ndr_pull_$2(ndr, $3, get_subtree(tree, \"$7\", ndr, ett_$2), $4); /smgx; } @@ -709,7 +709,7 @@ sub RewriteC($$$) s/(ndr_pull_([^\)]*?)\( ndr,\ (NDR_[^,]*?),\ - (&?r->(in|out|)\.?([^\(].*?))\);) + (&?r->((in|out)\.)?([^\(].*?))\);) /ndr_pull_$2(ndr, $3, get_subtree(tree, \"$2\", ndr, ett_$2), $4); /smgx; } |