r25794: use NDR_CHECK()

[martins/samba.git] / source4 / librpc / ndr / ndr_basic.c

diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c
index a26b67af226c54826ce9165d9ce959ac64e9c7d6..b406791a27233288b0f08227c4092565c49ca774 100644 (file)
--- 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;
 }
 
 /*