From 3e1fb13024eec442bfdd0335bc03689f64d50c0e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 9 Nov 2007 19:23:25 +0100 Subject: r25915: ndr/pidl: change NTSTAUS into enum ndr_err_code (pidl code) Samba4/NDR/Parser.pm Samba4/NDR/Server.pm Samba3/ServerNDR.pm tests/ metze (This used to be commit 7106f21de8dfc472aa0846b49bfdb7543c63b310) --- source4/pidl/tests/ndr_align.pl | 10 ++++----- source4/pidl/tests/ndr_alloc.pl | 10 ++++----- source4/pidl/tests/ndr_array.pl | 2 +- source4/pidl/tests/ndr_fullptr.pl | 2 +- source4/pidl/tests/ndr_refptr.pl | 44 ++++++++++++++++++------------------- source4/pidl/tests/ndr_represent.pl | 25 +++++++++------------ source4/pidl/tests/ndr_simple.pl | 2 +- source4/pidl/tests/ndr_string.pl | 6 ++--- source4/pidl/tests/ndr_tagtype.pl | 6 ++--- 9 files changed, 51 insertions(+), 56 deletions(-) (limited to 'source4/pidl/tests') diff --git a/source4/pidl/tests/ndr_align.pl b/source4/pidl/tests/ndr_align.pl index 28b29d9196..1f4a0da9bb 100755 --- a/source4/pidl/tests/ndr_align.pl +++ b/source4/pidl/tests/ndr_align.pl @@ -24,7 +24,7 @@ test_samba4_ndr('align-uint8-uint16', r.x = 13; r.y = 0xbeef; - if (!NT_STATUS_IS_OK(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); @@ -49,7 +49,7 @@ test_samba4_ndr('align-uint8-uint32', r.x = 13; r.y = 0xbeefbeef; - if (!NT_STATUS_IS_OK(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); @@ -76,7 +76,7 @@ test_samba4_ndr('align-uint8-hyper', r.x = 13; r.y = 0xbeefbeefbeefbeefLLU; - if (!NT_STATUS_IS_OK(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); @@ -103,7 +103,7 @@ test_samba4_ndr('noalignflag-uint8-uint16', r.x = 13; r.y = 0xbeef; - if (!NT_STATUS_IS_OK(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); @@ -133,7 +133,7 @@ test_samba4_ndr('align-blob-align2', r.data.data = data; r.data.length = 2; - if (!NT_STATUS_IS_OK(ndr_push_blie(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_blie(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); diff --git a/source4/pidl/tests/ndr_alloc.pl b/source4/pidl/tests/ndr_alloc.pl index b1c7ae08c3..e967bb7cdb 100755 --- a/source4/pidl/tests/ndr_alloc.pl +++ b/source4/pidl/tests/ndr_alloc.pl @@ -23,7 +23,7 @@ test_samba4_ndr("alloc-scalar", struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL); struct TestAlloc r; - if (!NT_STATUS_IS_OK(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) return 1; if (r.in.foo.x == NULL) @@ -47,7 +47,7 @@ test_samba4_ndr("alloc-buffer", struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL); struct TestAlloc r; - if (!NT_STATUS_IS_OK(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) return 1; if (r.in.foo.x == NULL) @@ -69,7 +69,7 @@ test_samba4_ndr("ref-noalloc-null", struct TestAlloc r; r.in.t = NULL; - if (NT_STATUS_IS_OK(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) + if (NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) return 1; ' ); @@ -86,7 +86,7 @@ test_samba4_ndr("ref-noalloc", uint8_t x; r.in.t = &x; - if (!NT_STATUS_IS_OK(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) return 1; if (*r.in.t != 0x03) @@ -106,7 +106,7 @@ test_samba4_ndr("ref-alloc", ndr->flags |= LIBNDR_FLAG_REF_ALLOC; r.in.t = NULL; - if (!NT_STATUS_IS_OK(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) return 1; if (r.in.t == NULL) diff --git a/source4/pidl/tests/ndr_array.pl b/source4/pidl/tests/ndr_array.pl index 8e40d36a10..174d702c07 100755 --- a/source4/pidl/tests/ndr_array.pl +++ b/source4/pidl/tests/ndr_array.pl @@ -25,7 +25,7 @@ test_samba4_ndr( b.length = 10; ndr = ndr_pull_init_blob(&b, mem_ctx); - if (!NT_STATUS_IS_OK(ndr_pull_Test(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_Test(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 10) diff --git a/source4/pidl/tests/ndr_fullptr.pl b/source4/pidl/tests/ndr_fullptr.pl index 2188905b13..27d4e69447 100755 --- a/source4/pidl/tests/ndr_fullptr.pl +++ b/source4/pidl/tests/ndr_fullptr.pl @@ -23,7 +23,7 @@ test_samba4_ndr("fullptr-push-dup", r.in.x = &v; r.in.y = &v; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestFull(ndr, NDR_IN, &r))) { + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestFull(ndr, NDR_IN, &r))) { fprintf(stderr, "push failed\n"); return 1; } diff --git a/source4/pidl/tests/ndr_refptr.pl b/source4/pidl/tests/ndr_refptr.pl index d5e73559d9..0fb4810285 100755 --- a/source4/pidl/tests/ndr_refptr.pl +++ b/source4/pidl/tests/ndr_refptr.pl @@ -23,7 +23,7 @@ test_samba4_ndr("noptr-push", struct echo_TestRef r; r.in.foo.x = v; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) { + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) { fprintf(stderr, "push failed\n"); return 1; } @@ -52,7 +52,7 @@ test_samba4_ndr("ptr-embedded-push", struct echo_TestRef r; r.in.foo.x = &v; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 6) @@ -78,7 +78,7 @@ test_samba4_ndr("ptr-embedded-push-null", struct echo_TestRef r; r.in.foo.x = NULL; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 4) @@ -103,7 +103,7 @@ test_samba4_ndr("refptr-embedded-push", struct echo_TestRef r; r.in.foo.x = &v; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 6) @@ -130,7 +130,7 @@ test_samba4_ndr("refptr-embedded-push-null", struct echo_TestRef r; r.in.foo.x = NULL; - if (NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; /* Windows gives [client runtime error 0x6f4] */ '); @@ -150,7 +150,7 @@ test_samba4_ndr("ptr-top-push", s.x = 13; r.in.foo = &s; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 2) @@ -173,7 +173,7 @@ test_samba4_ndr("ptr-top-push-null", struct echo_TestRef r; r.in.foo = NULL; - if (NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; /* Windows gives [client runtime error 0x6f4] */ @@ -195,7 +195,7 @@ test_samba4_ndr("refptr-top-push", s.x = 13; r.in.foo = &s; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 2) @@ -218,7 +218,7 @@ test_samba4_ndr("refptr-top-push-null", struct echo_TestRef r; r.in.foo = NULL; - if (NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; /* Windows gives [client runtime error 0x6f4] */ @@ -239,7 +239,7 @@ test_samba4_ndr("uniqueptr-top-push", s.x = 13; r.in.foo = &s; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 6) @@ -265,7 +265,7 @@ test_samba4_ndr("uniqueptr-top-push-null", struct echo_TestRef r; r.in.foo = NULL; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 4) @@ -294,7 +294,7 @@ test_samba4_ndr("ptr-top-out-pull", r.out.foo = &s; - if (!NT_STATUS_IS_OK(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) return 1; if (!r.out.foo) @@ -320,7 +320,7 @@ test_samba4_ndr("ptr-top-out-pull-null", r.out.foo = NULL; - if (NT_STATUS_IS_OK(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) + if (NDR_ERR_CODE_IS_SUCCESS(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) return 1; /* Windows gives [client runtime error 0x6f4] */ @@ -344,7 +344,7 @@ test_samba4_ndr("refptr-top-out-pull", r.out.foo = &s; - if (!NT_STATUS_IS_OK(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) return 1; if (!r.out.foo) @@ -370,7 +370,7 @@ test_samba4_ndr("refptr-top-out-pull-null", r.out.foo = NULL; - if (NT_STATUS_IS_OK(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) + if (NDR_ERR_CODE_IS_SUCCESS(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) return 1; /* Windows gives [client runtime error 0x6f4] */ @@ -387,7 +387,7 @@ test_samba4_ndr("ptr-top-push-double", uint16_t *pv = &v; r.in.foo = &pv; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 6) @@ -413,7 +413,7 @@ test_samba4_ndr("ptr-top-push-double-sndnull", uint16_t *pv = NULL; r.in.foo = &pv; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 4) @@ -433,7 +433,7 @@ test_samba4_ndr("ptr-top-push-double-fstnull", struct echo_TestRef r; r.in.foo = NULL; - if (NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; /* Windows gives [client runtime error 0x6f4] */ @@ -451,7 +451,7 @@ test_samba4_ndr("refptr-top-push-double", uint16_t *pv = &v; r.in.foo = &pv; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 6) @@ -478,7 +478,7 @@ test_samba4_ndr("refptr-top-push-double-sndnull", uint16_t *pv = NULL; r.in.foo = &pv; - if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 4) @@ -498,7 +498,7 @@ test_samba4_ndr("refptr-top-push-double-fstnull", struct echo_TestRef r; r.in.foo = NULL; - if (NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; /* Windows gives [client runtime error 0x6f4] */ @@ -517,7 +517,7 @@ test_samba4_ndr("ignore-ptr", r.in.foo = &v; r.in.bar = &v; - if (NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (NDR_ERR_CODE_IS_SUCCESS(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 4) diff --git a/source4/pidl/tests/ndr_represent.pl b/source4/pidl/tests/ndr_represent.pl index b5ee312668..8c52015642 100755 --- a/source4/pidl/tests/ndr_represent.pl +++ b/source4/pidl/tests/ndr_represent.pl @@ -18,25 +18,23 @@ test_samba4_ndr('represent_as-simple', struct ndr_pull *ndr = ndr_pull_init_blob(&in_blob, NULL); struct bla r; - if (!NT_STATUS_IS_OK(ndr_pull_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; if (r.in.x != 13) return 2; ', ' -#include - -NTSTATUS ndr_uint8_to_uint32(uint8_t from, uint32_t *to) +enum ndr_err_code ndr_uint8_to_uint32(uint8_t from, uint32_t *to) { *to = from; - return NT_STATUS_OK; + return NDR_ERR_SUCCESS; } -NTSTATUS ndr_uint32_to_uint8(uint32_t from, uint8_t *to) +enum ndr_err_code ndr_uint32_to_uint8(uint32_t from, uint8_t *to) { *to = from; - return NT_STATUS_OK; + return NDR_ERR_SUCCESS; } ' ); @@ -51,26 +49,23 @@ test_samba4_ndr('transmit_as-simple', struct ndr_pull *ndr = ndr_pull_init_blob(&in_blob, NULL); struct bla r; - if (!NT_STATUS_IS_OK(ndr_pull_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; if (r.in.x != 13) return 2; ', ' -#include - -NTSTATUS ndr_uint8_to_uint32(uint8_t from, uint32_t *to) +enum ndr_err_code ndr_uint8_to_uint32(uint8_t from, uint32_t *to) { *to = from; - return NT_STATUS_OK; + return NDR_ERR_SUCCESS; } -NTSTATUS ndr_uint32_to_uint8(uint32_t from, uint8_t *to) +enum ndr_err_code ndr_uint32_to_uint8(uint32_t from, uint8_t *to) { *to = from; - return NT_STATUS_OK; + return NDR_ERR_SUCCESS; } ' ); - diff --git a/source4/pidl/tests/ndr_simple.pl b/source4/pidl/tests/ndr_simple.pl index 466a164df4..e5e4197a4f 100755 --- a/source4/pidl/tests/ndr_simple.pl +++ b/source4/pidl/tests/ndr_simple.pl @@ -20,7 +20,7 @@ test_samba4_ndr("simple", "void Test(); ", b.length = 1; ndr = ndr_pull_init_blob(&b, mem_ctx); - if (!NT_STATUS_IS_OK(ndr_pull_uint8(ndr, NDR_SCALARS, &result))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_uint8(ndr, NDR_SCALARS, &result))) return 1; if (result != 0x02) diff --git a/source4/pidl/tests/ndr_string.pl b/source4/pidl/tests/ndr_string.pl index 4568ec89b8..834ef5a289 100755 --- a/source4/pidl/tests/ndr_string.pl +++ b/source4/pidl/tests/ndr_string.pl @@ -18,7 +18,7 @@ test_samba4_ndr("string-pull-empty", struct TestString r; r.in.data = NULL; - if (!NT_STATUS_IS_OK(ndr_pull_TestString(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestString(ndr, NDR_IN, &r))) return 1; if (r.in.data == NULL) @@ -40,7 +40,7 @@ test_samba4_ndr("string-ascii-pull", struct TestString r; r.in.data = NULL; - if (!NT_STATUS_IS_OK(ndr_pull_TestString(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestString(ndr, NDR_IN, &r))) return 1; if (r.in.data == NULL) @@ -69,7 +69,7 @@ test_samba4_ndr("string-out", char *str = NULL; r.out.data = &str; - if (!NT_STATUS_IS_OK(ndr_pull_TestString(ndr, NDR_IN, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestString(ndr, NDR_IN, &r))) return 1; if (r.out.data == NULL) diff --git a/source4/pidl/tests/ndr_tagtype.pl b/source4/pidl/tests/ndr_tagtype.pl index 7f5c24627a..4d6bcb53af 100755 --- a/source4/pidl/tests/ndr_tagtype.pl +++ b/source4/pidl/tests/ndr_tagtype.pl @@ -17,7 +17,7 @@ test_samba4_ndr('struct-notypedef', '[public] struct bla { uint8 x; }; ', DATA_BLOB result_blob; r.x = 13; - if (!NT_STATUS_IS_OK(ndr_push_STRUCT_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_STRUCT_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); @@ -36,7 +36,7 @@ test_samba4_ndr('struct-notypedef-used', '[public] struct bla { uint8 x; }; DATA_BLOB result_blob; fn.in.r.x = 13; - if (!NT_STATUS_IS_OK(ndr_push_myfn(ndr, NDR_IN, &fn))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_myfn(ndr, NDR_IN, &fn))) return 1; result_blob = ndr_push_blob(ndr); @@ -56,7 +56,7 @@ test_samba4_ndr('struct-notypedef-embedded', 'struct bla { uint8 x; }; DATA_BLOB result_blob; st.r.x = 13; - if (!NT_STATUS_IS_OK(ndr_push_STRUCT_myst(ndr, NDR_IN, &st))) + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_STRUCT_myst(ndr, NDR_IN, &st))) return 1; result_blob = ndr_push_blob(ndr); -- cgit