use NT_STATUS_HAVE_NO_MEMORY() and NDR_CHECK() macros

metze

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25778 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/librpc/ndr/ndr.c b/source/librpc/ndr/ndr.c
index 26bda3372314f170eb5a65495cb101a567ee49b7..16a1cd6ed4e4ff887097fc65188f8583d27473cd 100644 (file)
--- a/source/librpc/ndr/ndr.c
+++ b/source/librpc/ndr/ndr.c
@@ -691,10 +691,9 @@ NTSTATUS ndr_pull_struct_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *
 {
        struct ndr_pull *ndr;
        ndr = ndr_pull_init_blob(blob, mem_ctx);
-       if (!ndr) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       return fn(ndr, NDR_SCALARS|NDR_BUFFERS, p);
+       NT_STATUS_HAVE_NO_MEMORY(ndr);
+       NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
+       return NT_STATUS_OK;
 }
 
 /*
@@ -704,14 +703,9 @@ NTSTATUS ndr_pull_struct_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, vo
                                  ndr_pull_flags_fn_t fn)
 {
        struct ndr_pull *ndr;
-       NTSTATUS status;
-
        ndr = ndr_pull_init_blob(blob, mem_ctx);
-       if (!ndr) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       status = fn(ndr, NDR_SCALARS|NDR_BUFFERS, p);
-       if (!NT_STATUS_IS_OK(status)) return status;
+       NT_STATUS_HAVE_NO_MEMORY(ndr);
+       NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
        if (ndr->offset < ndr->data_size) {
                return ndr_pull_error(ndr, NDR_ERR_UNREAD_BYTES,
                                      "not all bytes consumed ofs[%u] size[%u]",
@@ -728,11 +722,10 @@ NTSTATUS ndr_pull_union_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p
 {
        struct ndr_pull *ndr;
        ndr = ndr_pull_init_blob(blob, mem_ctx);
-       if (!ndr) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       NT_STATUS_HAVE_NO_MEMORY(ndr);
        ndr_pull_set_switch_value(ndr, p, level);
-       return fn(ndr, NDR_SCALARS|NDR_BUFFERS, p);
+       NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
+       return NT_STATUS_OK;
 }
 
 /*
@@ -743,15 +736,10 @@ _PUBLIC_ NTSTATUS ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem
                             uint32_t level, ndr_pull_flags_fn_t fn)
 {
        struct ndr_pull *ndr;
-       NTSTATUS status;
-
        ndr = ndr_pull_init_blob(blob, mem_ctx);
-       if (!ndr) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       NT_STATUS_HAVE_NO_MEMORY(ndr);
        ndr_pull_set_switch_value(ndr, p, level);
-       status = fn(ndr, NDR_SCALARS|NDR_BUFFERS, p);
-       if (!NT_STATUS_IS_OK(status)) return status;
+       NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
        if (ndr->offset < ndr->data_size) {
                return ndr_pull_error(ndr, NDR_ERR_UNREAD_BYTES,
                                      "not all bytes consumed ofs[%u] size[%u]",