svn commit: samba r26051 - in branches/SAMBA_4_0/source/librpc/ndr: .

[metze at samba.org]

Author: metze
Date: 2007-11-20 11:08:05 +0000 (Tue, 20 Nov 2007)
New Revision: 26051

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26051

Log:
ndr_string: don't use ndr_pull_save anymore

metze

Modified:
   branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2007-11-20 11:07:57 UTC (rev 26050)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2007-11-20 11:08:05 UTC (rev 26051)
@@ -650,21 +650,21 @@
 _PUBLIC_ enum ndr_err_code ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t count, uint32_t element_size)
 {
 	uint32_t i;
-	struct ndr_pull_save save_offset;
+	uint32_t save_offset;
 
-	ndr_pull_save(ndr, &save_offset);
+	save_offset = ndr->offset;
 	ndr_pull_advance(ndr, (count - 1) * element_size);
 	NDR_PULL_NEED_BYTES(ndr, element_size);
 
 	for (i = 0; i < element_size; i++) {
 		 if (ndr->data[ndr->offset+i] != 0) {
-			ndr_pull_restore(ndr, &save_offset);
+			ndr->offset = save_offset;
 
 			return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "String terminator not present or outside string boundaries");
 		 }
 	}
 
-	ndr_pull_restore(ndr, &save_offset);
+	ndr->offset = save_offset;
 
 	return NDR_ERR_SUCCESS;
 }