[SCM] Samba Shared Repository - branch v3-6-test updated

[Stefan Metzmacher]

The branch, v3-6-test has been updated
       via  872d0fe pidl:Samba4/NDR/Client: fix arguments to warning()
       via  8669419 pidl:Samba4/NDR/Parser: fix compiler warnings in 'pipe' 
related code
      from  e6b4b1b tevent/poll: use fde->additional_flags to hold the array 
index

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 872d0fed26c62a8a5342e5a32a7ce50aecf9c910
Author: Stefan Metzmacher <me...@samba.org>
Date:   Fri Mar 11 09:01:00 2011 +0100

    pidl:Samba4/NDR/Client: fix arguments to warning()
    
    We want the file:line: information displayed.
    
    metze
    (cherry picked from commit 6771ade5e7933af57b286870d73e7773521b8fdd)

commit 8669419b261edc36ebb23f01c42f056b1581c5be
Author: Stefan Metzmacher <me...@samba.org>
Date:   Fri Mar 11 09:00:13 2011 +0100

    pidl:Samba4/NDR/Parser: fix compiler warnings in 'pipe' related code
    
    metze
    (cherry picked from commit f3465da07242cfa3f45da668c7ffa86e8beacf0e)

-----------------------------------------------------------------------

Summary of changes:
 pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm |    2 +-
 pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm 
b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index ab4f524..c796b46 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -743,7 +743,7 @@ sub ParseFunction($$$)
                $self->pidl_both(" * dcerpc_$fn->{NAME}()");
                $self->pidl_both(" */");
                $self->pidl_both("");
-               warning($fn, "$fn->{NAME}: dcerpc client does not support pipe 
yet");
+               warning($fn->{ORIGINAL}, "$fn->{NAME}: dcerpc client does not 
support pipe yet");
                return;
        }
 
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm 
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index f84610d..7cda272 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2466,7 +2466,7 @@ sub ParseGeneratePipeArray($$$)
                $self->deindent;
                $self->pidl("},");
        }
-       $self->pidl("{ NULL, NULL, 0, NULL, NULL, NULL, NULL }");
+       $self->pidl("{ NULL, NULL, 0, NULL, NULL, NULL }");
        $self->deindent;
        $self->pidl("};");
        $self->pidl("");
@@ -2523,11 +2523,11 @@ sub FunctionCallEntry($$)
        my $out_pipes_ptr = "NULL";
 
        if ($in_pipes) {
-               $in_pipes_ptr = "\&$d->{NAME}_in_pipes";
+               $in_pipes_ptr = "$d->{NAME}_in_pipes";
        }
 
        if ($out_pipes) {
-               $out_pipes_ptr = "\&$d->{NAME}_out_pipes";
+               $out_pipes_ptr = "$d->{NAME}_out_pipes";
        }
 
        $self->pidl("\t{");


-- 
Samba Shared Repository