Author: jelmer Date: 2005-08-24 11:17:28 +0000 (Wed, 24 Aug 2005) New Revision: 9576
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9576 Log: Couple of small fixes. Generate notice indicating that the parsers were autogenerated. Modified: branches/SAMBA_4_0/source/librpc/idl/atsvc.idl 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/librpc/idl/atsvc.idl =================================================================== --- branches/SAMBA_4_0/source/librpc/idl/atsvc.idl 2005-08-24 11:12:16 UTC (rev 9575) +++ branches/SAMBA_4_0/source/librpc/idl/atsvc.idl 2005-08-24 11:17:28 UTC (rev 9576) @@ -8,7 +8,7 @@ version(1.0), pointer_default(unique), pointer_default_top(unique), - helpstring("Queue/List/Remove jobs for later execution"), + helpstring("Microsoft AT-Scheduler Service"), endpoint("ncacn_np:[\\pipe\\atsvc]", "ncalrpc:") ] interface atsvc { 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-08-24 11:12:16 UTC (rev 9575) +++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm 2005-08-24 11:17:28 UTC (rev 9576) @@ -542,7 +542,7 @@ # in epan/dissctors are deleted. my $name = "\"" . uc($x->{NAME}) . " (pidl)\""; - my $short_name = $x->{NAME}; + my $short_name = uc($x->{NAME}); my $filter_name = $x->{NAME}; if (has_property($x, "helpstring")) { @@ -697,17 +697,30 @@ ##################################################################### # Generate ethereal parser and header code -sub Parse($$) +sub Parse($$$$) { - my($ndr,$h_filename,$cnf_file) = @_; + my($ndr,$idl_file,$h_filename,$cnf_file) = @_; Initialize($cnf_file); $tabs = ""; %res = (code=>"",def=>"",hdr=>""); - pidl_hdr "/* header auto-generated by pidl */"; + my $notice = +"/* DO NOT EDIT + This filter was automatically generated + from $idl_file and $cnf_file. + + Pidl is a perl based IDL compiler for DCE/RPC idl files. + It is maintained by the Samba team, not the Ethereal team. + Instructions on how to download and install Pidl can be + found at http://wiki.ethereal.com/Pidl +*/ +"; + + pidl_hdr $notice; + $res{headers} = "\n"; $res{headers} .= "#ifdef HAVE_CONFIG_H\n"; $res{headers} .= "#include \"config.h\"\n"; @@ -733,7 +746,7 @@ $res{ett} = DumpEttDeclaration(); $res{hf} = DumpHfDeclaration(); - my $parser = "/* parser auto-generated by pidl */"; + my $parser = $notice; $parser.= $res{headers}; $parser.=$res{ett}; $parser.=$res{hf}; Modified: branches/SAMBA_4_0/source/pidl/pidl =================================================================== --- branches/SAMBA_4_0/source/pidl/pidl 2005-08-24 11:12:16 UTC (rev 9575) +++ branches/SAMBA_4_0/source/pidl/pidl 2005-08-24 11:17:28 UTC (rev 9576) @@ -101,26 +101,26 @@ --parse parse a idl file to a .pidl file --dump dump a pidl file back to idl --diff run diff on the idl and dumped output - --keep[=OUTFILE] keep the .pidl file + --keep[=OUTFILE] keep the .pidl file [BASENAME.pidl] --odl accept ODL input --warn-compat warn about incompatibility with other compilers --quiet be quiet --verbose be verbose Samba 4 output: - --header[=OUTFILE] create generic header file + --header[=OUTFILE] create generic header file [BASENAME.h] --uint-enums don't use C enums, instead use uint* types - --ndr-header[=OUTFILE] create a C NDR-specific header file - --ndr-parser[=OUTFILE] create a C NDR parser - --client[=OUTFILE] create a C NDR client - --tdr-header[=OUTFILE] create a C TDR header file - --tdr-parser[=OUTFILE] create a C TDR parser - --ejs[=OUTFILE] create ejs wrapper file - --swig[=OUTFILE] create swig wrapper file - --server[=OUTFILE] create server boilerplate + --ndr-header[=OUTFILE] create a C NDR-specific header file [ndr_BASENAME.h] + --ndr-parser[=OUTFILE] create a C NDR parser [ndr_BASENAME.c] + --client[=OUTFILE] create a C NDR client [ndr_BASENAME_c.c] + --tdr-header[=OUTFILE] create a C TDR header file [tdr_BASENAME.h] + --tdr-parser[=OUTFILE] create a C TDR parser [tdr_BASENAME.c] + --ejs[=OUTFILE] create ejs wrapper file [BASENAME_ejs.c] + --swig[=OUTFILE] create swig wrapper file [BASENAME.i] + --server[=OUTFILE] create server boilerplate [ndr_BASENAME_s.c] --template print a template for a pipe - --dcom-proxy[=OUTFILE] create DCOM proxy (implies --odl) - --com-header[=OUTFILE] create header for COM interfaces (implies --odl) + --dcom-proxy[=OUTFILE] create DCOM proxy (implies --odl) [ndr_BASENAME_p.c] + --com-header[=OUTFILE] create header for COM (implies --odl) [com_BASENAME.h] Ethereal parsers: --eth-parser[=OUTFILE] create ethereal parser and header @@ -325,7 +325,7 @@ my $cnffile = $idl_file; $cnffile =~ s/\.idl$/\.cnf/; - my ($dp, $dh) = Parse::Pidl::Ethereal::NDR::Parse($ndr, $eheader, $cnffile); + my ($dp, $dh) = Parse::Pidl::Ethereal::NDR::Parse($ndr, $idl_file, $eheader, $cnffile); FileSave($eparser, $dp); FileSave($eheader, $dh); }
