diff options
author | Jörg Mayer <jmayer@loplof.de> | 2007-11-20 17:08:52 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2007-11-20 17:08:52 +0000 |
commit | af8202cad02b1df7e623f6ead5fb71b917db5da2 (patch) | |
tree | 51acfe1e3896c17cf3e92ec2d3878777b3223ac3 /tools/pidl/tests/ndr_represent.pl | |
parent | 58914b5248b3f4e09be4394ac47f297fbd226877 (diff) | |
download | wireshark-af8202cad02b1df7e623f6ead5fb71b917db5da2.tar.gz |
Update from samba tree revision 25880 to 26066
============================ Samba log start ============
------------------------------------------------------------------------
r25915 | metze | 2007-11-09 20:23:25 +0100 (Fri, 09 Nov 2007) | 9 lines
ndr/pidl: change NTSTAUS into enum ndr_err_code (pidl code)
Samba4/NDR/Parser.pm
Samba4/NDR/Server.pm
Samba3/ServerNDR.pm
tests/
metze
------------------------------------------------------------------------
r26049 | metze | 2007-11-20 12:07:50 +0100 (Tue, 20 Nov 2007) | 4 lines
pidl: don't use ndr_pull_save anymore
metze
------------------------------------------------------------------------
------------------------------------------------------------------------
============================ Samba log end ==============
svn path=/trunk/; revision=23512
Diffstat (limited to 'tools/pidl/tests/ndr_represent.pl')
-rw-r--r-- | tools/pidl/tests/ndr_represent.pl | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/tools/pidl/tests/ndr_represent.pl b/tools/pidl/tests/ndr_represent.pl index b5ee312668..8c52015642 100644 --- a/tools/pidl/tests/ndr_represent.pl +++ b/tools/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 <libcli/util/ntstatus.h> - -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 <libcli/util/ntstatus.h> - -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; } ' ); - |