summaryrefslogtreecommitdiff
path: root/source4/librpc/ndr
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-02 10:32:47 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:44:02 +0100
commitfb4032a470e3b058cd91da86006f69a5cd2bd8ff (patch)
tree46516ae37a11a64117b532113108d12e0d7f94e0 /source4/librpc/ndr
parent2a9e6744423126b0b0cb1e0e341e59ddf8dea4a3 (diff)
downloadsamba-fb4032a470e3b058cd91da86006f69a5cd2bd8ff.tar.gz
samba-fb4032a470e3b058cd91da86006f69a5cd2bd8ff.tar.bz2
samba-fb4032a470e3b058cd91da86006f69a5cd2bd8ff.zip
r25794: use NDR_CHECK()
metze (This used to be commit 614e812bb01ebaa39db10c25cd011bef7f1279b2)
Diffstat (limited to 'source4/librpc/ndr')
-rw-r--r--source4/librpc/ndr/ndr_basic.c7
1 files changed, 3 insertions, 4 deletions
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;
}
/*