From a0f59767f4f4ccf4653a7a377c95b5a93bb02efb Mon Sep 17 00:00:00 2001 From: metze Date: Fri, 2 Nov 2007 10:32:47 +0000 Subject: use NDR_CHECK() metze git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25794 0c0555d6-39d7-0310-84fc-f1cc0bd64818 (This used to be commit 91ccaa8e70f1665bd759a80363cda9605399464e) --- source3/librpc/ndr/ndr_basic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source3/librpc/ndr') diff --git a/source3/librpc/ndr/ndr_basic.c b/source3/librpc/ndr/ndr_basic.c index e036eae704..5377ed3dd3 100644 --- a/source3/librpc/ndr/ndr_basic.c +++ b/source3/librpc/ndr/ndr_basic.c @@ -128,12 +128,11 @@ NTSTATUS ndr_pull_uint32(struct ndr_pull *ndr, int ndr_flags, uint32_t *v) */ NTSTATUS ndr_pull_generic_ptr(struct ndr_pull *ndr, uint32_t *v) { - NTSTATUS status; - status = ndr_pull_uint32(ndr, NDR_SCALARS, v); - if (NT_STATUS_IS_OK(status) && *v != 0) { + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, v)); + if (*v != 0) { ndr->ptr_count++; } - return status; + return NT_STATUS_OK; } /* -- cgit