svn commit: samba r5007 - in branches/SAMBA_4_0/source/build/pidl: .

[tpot at samba.org]

Author: tpot
Date: 2005-01-26 05:24:13 +0000 (Wed, 26 Jan 2005)
New Revision: 5007

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5007

Log:
Fix bug in regexp where we were eating the strings "in" or "out" from
structure names if they started with those strings.

Modified:
   branches/SAMBA_4_0/source/build/pidl/eparser.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/eparser.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/eparser.pm	2005-01-26 04:50:04 UTC (rev 5006)
+++ branches/SAMBA_4_0/source/build/pidl/eparser.pm	2005-01-26 05:24:13 UTC (rev 5007)
@@ -698,8 +698,8 @@
 	    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 @@
 	    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;
 	}