Author: tpot
Date: 2005-09-03 02:08:25 +0000 (Sat, 03 Sep 2005)
New Revision: 9984

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

Log:
Honour the NOEMIT conformance directive for entire IDL files.

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
   branches/SAMBA_4_0/source/pidl/pidl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm       
2005-09-03 02:06:32 UTC (rev 9983)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm       
2005-09-03 02:08:25 UTC (rev 9984)
@@ -707,6 +707,8 @@
        my($ndr,$idl_file,$h_filename,$cnf_file) = @_;
        Initialize($cnf_file);
 
+       return (undef, undef) if defined($conformance->{noemit_dissector});
+
        $tabs = "";
 
        %res = (code=>"",def=>"",hdr=>"");

Modified: branches/SAMBA_4_0/source/pidl/pidl
===================================================================
--- branches/SAMBA_4_0/source/pidl/pidl 2005-09-03 02:06:32 UTC (rev 9983)
+++ branches/SAMBA_4_0/source/pidl/pidl 2005-09-03 02:08:25 UTC (rev 9984)
@@ -326,8 +326,8 @@
          $cnffile =~ s/\.idl$/\.cnf/;
 
          my ($dp, $dh) = Parse::Pidl::Ethereal::NDR::Parse($ndr, $idl_file, 
$eheader, $cnffile);
-         FileSave($eparser, $dp);
-         FileSave($eheader, $dh);
+         FileSave($eparser, $dp) if defined($dp);
+         FileSave($eheader, $dh) if defined($dh);
        }
 
        my $tdr_parser = ($opt_tdr_parser or "$outputdir/tdr_$basename.c");

Reply via email to