pidl:Samba4/NDR/Client: remove compat mode for dcerpc_pipe based bindings

The only consumer "openchange" uses the dcerpc_binding_handle based
functions now.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Jan 21 08:16:25 CET 2011 on sn-devel-104

diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index 32309580f40e9dddabe3aa1860e4ed135a7465ed..2397f1a17d1070d266613330296a70ac6984cd4c 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -220,49 +220,6 @@ sub ParseFunction_r_Sync($$$$)
        $self->pidl("");
 }
 
-sub ParseFunction_Compat_Sync($$$$)
-{
-       my ($self, $if, $fn, $name) = @_;
-       my $uname = uc $name;
-
-       my $proto = "NTSTATUS dcerpc_$name\_compat(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r)";
-
-       $self->pidl_hdr("#ifdef DCERPC_CALL_$uname\_COMPAT");
-       $self->pidl_hdr("#define dcerpc_$name(p, m, r) dcerpc_$name\_compat(p, m, r)");
-       $self->pidl_hdr("#endif /* DCERPC_CALL_$uname\_COMPAT */");
-
-       $self->fn_declare($proto);
-       $self->pidl("{");
-       $self->indent;
-       $self->pidl("NTSTATUS status;");
-       $self->pidl("");
-
-       $self->pidl("status = dcerpc_$name\_r(p->binding_handle, mem_ctx, r);");
-       $self->pidl("");
-
-       $self->pidl("if (NT_STATUS_IS_RPC(status)) {");
-       $self->indent;
-       $self->pidl("status = NT_STATUS_NET_WRITE_FAULT;");
-       $self->deindent;
-       $self->pidl("}");
-       $self->pidl("");
-
-       if (defined($fn->{RETURN_TYPE}) and $fn->{RETURN_TYPE} eq "NTSTATUS") {
-               $self->pidl("if (NT_STATUS_IS_OK(status)) {");
-               $self->indent;
-               $self->pidl("status = r->out.result;");
-               $self->deindent;
-               $self->pidl("}");
-               $self->pidl("");
-       }
-
-       $self->pidl("return status;");
-
-       $self->deindent;
-       $self->pidl("}");
-       $self->pidl("");
-}
-
 sub ElementDirection($)
 {
        my ($e) = @_;
@@ -682,9 +639,7 @@ sub ParseFunction_Sync($$$$)
                $fn_args .= ",\n" . $pad . mapTypeName($fn->{RETURN_TYPE}). " *result";
        }
 
-       $self->pidl_hdr("#ifndef DCERPC_CALL_$uname\_COMPAT");
        $self->fn_declare("$fn_str($fn_args)");
-       $self->pidl_hdr("#endif /* DCERPC_CALL_$uname\_COMPAT */");
        $self->pidl("{");
        $self->indent;
        $self->pidl("struct $name r;");
@@ -740,8 +695,6 @@ sub ParseFunction($$$)
        $self->ParseFunction_r_Recv($if, $fn, $fn->{NAME});
        $self->ParseFunction_r_Sync($if, $fn, $fn->{NAME});
 
-       $self->ParseFunction_Compat_Sync($if, $fn, $fn->{NAME});
-
        foreach my $e (@{$fn->{ELEMENTS}}) {
                next unless (grep(/out/, @{$e->{DIRECTION}}));
 
@@ -811,16 +764,6 @@ sub ParseInterface($$)
                $self->pidl_hdr("");
        }
 
-       $self->pidl_hdr("#ifdef DCERPC_IFACE_$ifu\_COMPAT");
-       foreach my $fn (@{$if->{FUNCTIONS}}) {
-               next if has_property($fn, "noopnum");
-               next if has_property($fn, "todo");
-               my $fnu = uc($fn->{NAME});
-               $self->pidl_hdr("#define DCERPC_CALL_$fnu\_COMPAT 1");
-       }
-       $self->pidl_hdr("#endif /* DCERPC_IFACE_$ifu\_COMPAT */");
-       $self->pidl_hdr("");
-
        $self->pidl("/* $if->{NAME} - client functions generated by pidl */");
        $self->pidl("");