pidl: Use NDR_ZERO_STRUCT(P) macros

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13778

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index c87d17a5a78c1ab21b70fc7e25cdd85875a0efc6..fa7303b854340976fc9b34d253ccfcd3f08eb89e 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -103,7 +103,7 @@ sub CallWithStruct($$$$$$)
                if (grep(/out/, @{$_->{DIRECTION}})) { $hasout = 1; }
        }
 
-       pidl "ZERO_STRUCT(r->out);" if ($hasout);
+       pidl "NDR_ZERO_STRUCT(r->out);" if ($hasout);
 
        foreach (@{$fn->{ELEMENTS}}) {
                my @dir = @{$_->{DIRECTION}};

diff --git a/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm b/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm
index 35e6e3f0d1969210e6f3f2275eb3c1968cd456fa..de050e8f8c63ffc096e7e3f50426605a7fe9aa3c 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm
@@ -101,7 +101,7 @@ static $tn dcom_proxy_$interface->{NAME}_$name(struct $interface->{NAME} *d, TAL
                return status;
        }
 
-       ZERO_STRUCT(r.in.ORPCthis);
+       NDR_ZERO_STRUCT(r.in.ORPCthis);
        r.in.ORPCthis.version.MajorVersion = COM_MAJOR_VERSION;
        r.in.ORPCthis.version.MinorVersion = COM_MINOR_VERSION;
 ";

diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index 040cd5a4bd337586a15edd9d32488876d755d781..734e86dd1833a86780920cfc2d04a97af78b2318 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -496,7 +496,7 @@ sub ParseFunction_Send($$$$)
 
        if (defined($fn->{RETURN_TYPE})) {
                $self->pidl("/* Result */");
-               $self->pidl("ZERO_STRUCT(state->orig.out.result);");
+               $self->pidl("NDR_ZERO_STRUCT(state->orig.out.result);");
                $self->pidl("");
        }
 
@@ -585,7 +585,7 @@ sub ParseFunction_Done($$$$)
        }
 
        $self->pidl("/* Reset temporary structure */");
-       $self->pidl("ZERO_STRUCT(state->tmp);");
+       $self->pidl("NDR_ZERO_STRUCT(state->tmp);");
        $self->pidl("");
 
        $self->pidl("tevent_req_done(req);");
@@ -698,7 +698,7 @@ sub ParseFunction_Sync($$$$)
 
        if (defined($fn->{RETURN_TYPE})) {
                $self->pidl("/* Result */");
-               $self->pidl("ZERO_STRUCT(r.out.result);");
+               $self->pidl("NDR_ZERO_STRUCT(r.out.result);");
                $self->pidl("");
        }
 

diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index eae58a9a4320e5f1fe8d49e49af42bdcf71f3c20..432e52f89c4562f7ff32f8dd4fb8a2f12a910469 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1134,7 +1134,7 @@ sub ParseElementPullLevel
        if (has_property($e, "skip") or has_property($e, "skip_noinit")) {
                $self->pidl("/* [skip] '$var_name' */");
                if (not has_property($e, "skip_noinit")) {
-                       $self->pidl("ZERO_STRUCT($var_name);");
+                       $self->pidl("NDR_ZERO_STRUCT($var_name);");
                }
                return;
        }
@@ -2551,7 +2551,7 @@ sub ParseFunctionPull($$)
        # out to be too tricky (tridge)
        foreach my $e (@{$fn->{ELEMENTS}}) {
                next unless grep(/out/, @{$e->{DIRECTION}});
-               $self->pidl("ZERO_STRUCT(r->out);");
+               $self->pidl("NDR_ZERO_STRUCT(r->out);");
                $self->pidl("");
                last;
        }
@@ -2600,7 +2600,7 @@ sub ParseFunctionPull($$)
                        if (grep(/in/, @{$e->{DIRECTION}})) {
                                $self->pidl("*r->out.$e->{NAME} = *r->in.$e->{NAME};");
                        } else {
-                               $self->pidl("ZERO_STRUCTP(r->out.$e->{NAME});");
+                               $self->pidl("NDR_ZERO_STRUCTP(r->out.$e->{NAME});");
                        }
                }
        }