diff options
author | Volker Lendecke <vlendec@samba.org> | 2006-11-19 18:57:52 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:56 -0500 |
commit | 01367cdfd03d2412904c57807e1ff3c62696d05f (patch) | |
tree | b887c607396a74e52fe65477b92982407729c995 /source3/rpcclient/cmd_echo.c | |
parent | 3372adce58070febd728ee0f941e48d69acc40b4 (diff) | |
download | samba-01367cdfd03d2412904c57807e1ff3c62696d05f.tar.gz samba-01367cdfd03d2412904c57807e1ff3c62696d05f.tar.bz2 samba-01367cdfd03d2412904c57807e1ff3c62696d05f.zip |
r19797: Convert the remaining pipes to the "new" unique out ptr handling
(This used to be commit bc4e0a388a2859d2ddcfb8f07920f3b121a37894)
Diffstat (limited to 'source3/rpcclient/cmd_echo.c')
-rw-r--r-- | source3/rpcclient/cmd_echo.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source3/rpcclient/cmd_echo.c b/source3/rpcclient/cmd_echo.c index 727dfd4df2..b8058fa28a 100644 --- a/source3/rpcclient/cmd_echo.c +++ b/source3/rpcclient/cmd_echo.c @@ -61,12 +61,11 @@ static NTSTATUS cmd_echo_data(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, size = atoi(argv[1]); in_data = (uint8 *)SMB_MALLOC(size); - out_data = (uint8 *)SMB_MALLOC(size); for (i = 0; i < size; i++) in_data[i] = i & 0xff; - result = rpccli_echo_EchoData(cli, mem_ctx, size, in_data, out_data); + result = rpccli_echo_EchoData(cli, mem_ctx, size, in_data, &out_data); if (!NT_STATUS_IS_OK(result)) goto done; @@ -81,7 +80,7 @@ static NTSTATUS cmd_echo_data(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, done: SAFE_FREE(in_data); - SAFE_FREE(out_data); + TALLOC_FREE(out_data); return result; } @@ -100,11 +99,8 @@ static NTSTATUS cmd_echo_source_data(struct rpc_pipe_client *cli, } size = atoi(argv[1]); - if (!(out_data = (uint8 *)SMB_MALLOC(size))) { - return NT_STATUS_NO_MEMORY; - } - result = rpccli_echo_SourceData(cli, mem_ctx, size, out_data); + result = rpccli_echo_SourceData(cli, mem_ctx, size, &out_data); if (!NT_STATUS_IS_OK(result)) goto done; @@ -118,7 +114,7 @@ static NTSTATUS cmd_echo_source_data(struct rpc_pipe_client *cli, } done: - SAFE_FREE(out_data); + TALLOC_FREE(out_data); return result; } |