Author: metze Date: 2007-10-31 16:44:42 +0000 (Wed, 31 Oct 2007) New Revision: 25768
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25768 Log: pidl: NT_STATUS_IS_ERR() is NOT the same as !NT_STATUS_IS_OK() Everything but success should be handled as error in the tests. metze Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl branches/SAMBA_4_0/source/pidl/tests/ndr_alloc.pl branches/SAMBA_4_0/source/pidl/tests/ndr_array.pl branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl branches/SAMBA_4_0/source/pidl/tests/ndr_simple.pl branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl branches/SAMBA_4_0/source/pidl/tests/ndr_tagtype.pl Changeset: Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl 2007-10-31 16:29:32 UTC (rev 25767) +++ branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl 2007-10-31 16:44:42 UTC (rev 25768) @@ -24,7 +24,7 @@ r.x = 13; r.y = 0xbeef; - if (NT_STATUS_IS_ERR(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NT_STATUS_IS_OK(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); @@ -49,7 +49,7 @@ r.x = 13; r.y = 0xbeefbeef; - if (NT_STATUS_IS_ERR(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NT_STATUS_IS_OK(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); @@ -76,7 +76,7 @@ r.x = 13; r.y = 0xbeefbeefbeefbeefLLU; - if (NT_STATUS_IS_ERR(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NT_STATUS_IS_OK(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); @@ -103,7 +103,7 @@ r.x = 13; r.y = 0xbeef; - if (NT_STATUS_IS_ERR(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NT_STATUS_IS_OK(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); @@ -133,7 +133,7 @@ r.data.data = data; r.data.length = 2; - if (NT_STATUS_IS_ERR(ndr_push_blie(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NT_STATUS_IS_OK(ndr_push_blie(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_alloc.pl =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/ndr_alloc.pl 2007-10-31 16:29:32 UTC (rev 25767) +++ branches/SAMBA_4_0/source/pidl/tests/ndr_alloc.pl 2007-10-31 16:44:42 UTC (rev 25768) @@ -23,7 +23,7 @@ struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL); struct TestAlloc r; - if (NT_STATUS_IS_ERR(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) return 1; if (r.in.foo.x == NULL) @@ -47,7 +47,7 @@ struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL); struct TestAlloc r; - if (NT_STATUS_IS_ERR(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) return 1; if (r.in.foo.x == NULL) @@ -86,7 +86,7 @@ uint8_t x; r.in.t = &x; - if (NT_STATUS_IS_ERR(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) return 1; if (*r.in.t != 0x03) @@ -106,7 +106,7 @@ ndr->flags |= LIBNDR_FLAG_REF_ALLOC; r.in.t = NULL; - if (NT_STATUS_IS_ERR(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_TestAlloc(ndr, NDR_IN, &r))) return 1; if (r.in.t == NULL) Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_array.pl =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/ndr_array.pl 2007-10-31 16:29:32 UTC (rev 25767) +++ branches/SAMBA_4_0/source/pidl/tests/ndr_array.pl 2007-10-31 16:44:42 UTC (rev 25768) @@ -25,7 +25,7 @@ b.length = 10; ndr = ndr_pull_init_blob(&b, mem_ctx); - if (NT_STATUS_IS_ERR(ndr_pull_Test(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_Test(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 10) Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl 2007-10-31 16:29:32 UTC (rev 25767) +++ branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl 2007-10-31 16:44:42 UTC (rev 25768) @@ -23,7 +23,7 @@ r.in.x = &v; r.in.y = &v; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestFull(ndr, NDR_IN, &r))) { + if (!NT_STATUS_IS_OK(ndr_push_echo_TestFull(ndr, NDR_IN, &r))) { fprintf(stderr, "push failed\n"); return 1; } Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl 2007-10-31 16:29:32 UTC (rev 25767) +++ branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl 2007-10-31 16:44:42 UTC (rev 25768) @@ -23,7 +23,7 @@ struct echo_TestRef r; r.in.foo.x = v; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) { + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) { fprintf(stderr, "push failed\n"); return 1; } @@ -52,7 +52,7 @@ struct echo_TestRef r; r.in.foo.x = &v; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 6) @@ -78,7 +78,7 @@ struct echo_TestRef r; r.in.foo.x = NULL; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 4) @@ -103,7 +103,7 @@ struct echo_TestRef r; r.in.foo.x = &v; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 6) @@ -150,7 +150,7 @@ s.x = 13; r.in.foo = &s; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 2) @@ -195,7 +195,7 @@ s.x = 13; r.in.foo = &s; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 2) @@ -239,7 +239,7 @@ s.x = 13; r.in.foo = &s; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 6) @@ -265,7 +265,7 @@ struct echo_TestRef r; r.in.foo = NULL; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 4) @@ -294,7 +294,7 @@ r.out.foo = &s; - if (NT_STATUS_IS_ERR(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) return 1; if (!r.out.foo) @@ -344,7 +344,7 @@ r.out.foo = &s; - if (NT_STATUS_IS_ERR(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_echo_TestRef(ndr, NDR_OUT, &r))) return 1; if (!r.out.foo) @@ -387,7 +387,7 @@ uint16_t *pv = &v; r.in.foo = &pv; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 6) @@ -413,7 +413,7 @@ uint16_t *pv = NULL; r.in.foo = &pv; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 4) @@ -451,7 +451,7 @@ uint16_t *pv = &v; r.in.foo = &pv; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 6) @@ -478,7 +478,7 @@ uint16_t *pv = NULL; r.in.foo = &pv; - if (NT_STATUS_IS_ERR(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_push_echo_TestRef(ndr, NDR_IN, &r))) return 1; if (ndr->offset != 4) Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl 2007-10-31 16:29:32 UTC (rev 25767) +++ branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl 2007-10-31 16:44:42 UTC (rev 25768) @@ -18,7 +18,7 @@ struct ndr_pull *ndr = ndr_pull_init_blob(&in_blob, NULL); struct bla r; - if (NT_STATUS_IS_ERR(ndr_pull_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; if (r.in.x != 13) @@ -51,7 +51,7 @@ struct ndr_pull *ndr = ndr_pull_init_blob(&in_blob, NULL); struct bla r; - if (NT_STATUS_IS_ERR(ndr_pull_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; if (r.in.x != 13) Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_simple.pl =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/ndr_simple.pl 2007-10-31 16:29:32 UTC (rev 25767) +++ branches/SAMBA_4_0/source/pidl/tests/ndr_simple.pl 2007-10-31 16:44:42 UTC (rev 25768) @@ -20,7 +20,7 @@ b.length = 1; ndr = ndr_pull_init_blob(&b, mem_ctx); - if (NT_STATUS_IS_ERR(ndr_pull_uint8(ndr, NDR_SCALARS, &result))) + if (!NT_STATUS_IS_OK(ndr_pull_uint8(ndr, NDR_SCALARS, &result))) return 1; if (result != 0x02) Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl 2007-10-31 16:29:32 UTC (rev 25767) +++ branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl 2007-10-31 16:44:42 UTC (rev 25768) @@ -18,7 +18,7 @@ struct TestString r; r.in.data = NULL; - if (NT_STATUS_IS_ERR(ndr_pull_TestString(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_TestString(ndr, NDR_IN, &r))) return 1; if (r.in.data == NULL) @@ -40,7 +40,7 @@ struct TestString r; r.in.data = NULL; - if (NT_STATUS_IS_ERR(ndr_pull_TestString(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_TestString(ndr, NDR_IN, &r))) return 1; if (r.in.data == NULL) @@ -69,7 +69,7 @@ char *str = NULL; r.out.data = &str; - if (NT_STATUS_IS_ERR(ndr_pull_TestString(ndr, NDR_IN, &r))) + if (!NT_STATUS_IS_OK(ndr_pull_TestString(ndr, NDR_IN, &r))) return 1; if (r.out.data == NULL) Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_tagtype.pl =================================================================== --- branches/SAMBA_4_0/source/pidl/tests/ndr_tagtype.pl 2007-10-31 16:29:32 UTC (rev 25767) +++ branches/SAMBA_4_0/source/pidl/tests/ndr_tagtype.pl 2007-10-31 16:44:42 UTC (rev 25768) @@ -17,7 +17,7 @@ DATA_BLOB result_blob; r.x = 13; - if (NT_STATUS_IS_ERR(ndr_push_STRUCT_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) + if (!NT_STATUS_IS_OK(ndr_push_STRUCT_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r))) return 1; result_blob = ndr_push_blob(ndr); @@ -36,7 +36,7 @@ DATA_BLOB result_blob; fn.in.r.x = 13; - if (NT_STATUS_IS_ERR(ndr_push_myfn(ndr, NDR_IN, &fn))) + if (!NT_STATUS_IS_OK(ndr_push_myfn(ndr, NDR_IN, &fn))) return 1; result_blob = ndr_push_blob(ndr); @@ -56,7 +56,7 @@ DATA_BLOB result_blob; st.r.x = 13; - if (NT_STATUS_IS_ERR(ndr_push_STRUCT_myst(ndr, NDR_IN, &st))) + if (!NT_STATUS_IS_OK(ndr_push_STRUCT_myst(ndr, NDR_IN, &st))) return 1; result_blob = ndr_push_blob(ndr);
