From fb4032a470e3b058cd91da86006f69a5cd2bd8ff Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 2 Nov 2007 10:32:47 +0100 Subject: r25794: use NDR_CHECK() metze (This used to be commit 614e812bb01ebaa39db10c25cd011bef7f1279b2) --- source4/librpc/ndr/ndr_basic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source4') diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c index a26b67af22..b406791a27 100644 --- a/source4/librpc/ndr/ndr_basic.c +++ b/source4/librpc/ndr/ndr_basic.c @@ -130,12 +130,11 @@ _PUBLIC_ NTSTATUS ndr_pull_uint32(struct ndr_pull *ndr, int ndr_flags, uint32_t */ _PUBLIC_ 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