[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  41f1c39 pidl:NDR/Parser: correctly set $ndr->[relative_highest_]offset for relative_short pointers
       via  5732c68 Revert "Remove a bunch of "unused variable _relative_save_offset" warnings."
      from  fa5898b Remove a bunch of "unused variable _relative_save_offset" warnings.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 41f1c3969a3f381379ca665b2d992070c8e50227
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed May 8 10:21:15 2013 +0200

    pidl:NDR/Parser: correctly set $ndr->[relative_highest_]offset for relative_short pointers
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed May  8 20:49:55 CEST 2013 on sn-devel-104

commit 5732c6840350f18dd779d5a088bc825a9d1b4069
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed May 8 10:18:54 2013 +0200

    Revert "Remove a bunch of "unused variable _relative_save_offset" warnings."
    
    This reverts commit fa5898b6de797431d5ae9d2ce6dcddcb35a60b66.
    
    This is the wrong fix for the warnings, the correct fix will follow.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>

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

Summary of changes:
 pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index ed86571..54b6f13 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1157,10 +1157,8 @@ sub ParseElementPullLevel
 			$self->indent;
 
 			if ($l->{POINTER_TYPE} eq "relative" or $l->{POINTER_TYPE} eq "relative_short") {
-				if ($l->{POINTER_TYPE} eq "relative") {
-					$self->pidl("uint32_t _relative_save_offset;");
-					$self->pidl("_relative_save_offset = $ndr->offset;");
-				}
+				$self->pidl("uint32_t _relative_save_offset;");
+				$self->pidl("_relative_save_offset = $ndr->offset;");
 				$self->pidl("NDR_CHECK(ndr_pull_relative_ptr2($ndr, $var_name));");
 			}
 		}
@@ -1173,7 +1171,7 @@ sub ParseElementPullLevel
 		$self->ParseMemCtxPullEnd($e, $l, $ndr);
 
 		if ($l->{POINTER_TYPE} ne "ref") {
-			if ($l->{POINTER_TYPE} eq "relative") {
+			if ($l->{POINTER_TYPE} eq "relative" or $l->{POINTER_TYPE} eq "relative_short") {
 				$self->pidl("if ($ndr->offset > $ndr->relative_highest_offset) {");
 				$self->indent;
 				$self->pidl("$ndr->relative_highest_offset = $ndr->offset;");


-- 
Samba Shared Repository