diff options
| author | Tim Potter <tpot@samba.org> | 2005-01-07 22:27:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:32 -0500 |
| commit | 0ee9f4d6e16d2760f31cc8c0a2f120131da24fd3 (patch) | |
| tree | 2a42cfe92dccc08be5e4eecf51d569d8b7a33f53 /source4/build/pidl/pidl.pl | |
| parent | e357b5b64a897e3b3570714da0584f966e6a0d42 (diff) | |
| download | samba-0ee9f4d6e16d2760f31cc8c0a2f120131da24fd3.tar.gz samba-0ee9f4d6e16d2760f31cc8c0a2f120131da24fd3.tar.bz2 samba-0ee9f4d6e16d2760f31cc8c0a2f120131da24fd3.zip | |
r4599: Remove some duplicated code in pidl.pl.
Start working on adding support for bitmaps and enums.
In progress tweaks for arrays of structures.
(This used to be commit d39cb7ecb4c193cbba628ee6d6f9b5c5bbf89d33)
Diffstat (limited to 'source4/build/pidl/pidl.pl')
| -rwxr-xr-x | source4/build/pidl/pidl.pl | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/source4/build/pidl/pidl.pl b/source4/build/pidl/pidl.pl index 6d0ff69081..5c09ca1842 100755 --- a/source4/build/pidl/pidl.pl +++ b/source4/build/pidl/pidl.pl @@ -141,6 +141,10 @@ sub process_file($) if ($opt_header) { my($header) = util::ChangeExtension($output, ".h"); util::FileSave($header, IdlHeader::Parse($pidl)); + if ($opt_eparser) { + my($eparserhdr) = dirname($output) . "/packet-dcerpc-$basename.h"; + IdlEParser::RewriteHeader($pidl, $header, $eparserhdr); + } } if ($opt_client) { @@ -202,26 +206,10 @@ $dcom if ($opt_parser) { my($parser) = util::ChangeExtension($output, ".c"); IdlParser::Parse($pidl, $parser); - } - - if ($opt_eparser) { - - # Generate regular .c and .h files for marshaling and - # unmarshaling. - - my($parser) = util::ChangeExtension($output, ".c"); - IdlParser::Parse($pidl, $parser); - - my($header) = util::ChangeExtension($output, ".h"); - util::FileSave($header, IdlHeader::Parse($pidl)); - - # Postprocess to produce ethereal parsers. - - my($eparser) = dirname($output) . "/packet-dcerpc-$basename.c"; - IdlEParser::RewriteC($pidl, $parser, $eparser); - - my($eparserhdr) = dirname($output) . "/packet-dcerpc-$basename.h"; - IdlEParser::RewriteHeader($pidl, $header, $eparserhdr); + if($opt_eparser) { + my($eparser) = dirname($output) . "/packet-dcerpc-$basename.c"; + IdlEParser::RewriteC($pidl, $parser, $eparser); + } } if ($opt_swig) { |