From a868a51eca659c3002ce23d2ea0708841f1f4772 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 4 Jun 2012 15:59:42 +0200 Subject: [PATCH] s3:libsmb: remove unused 'inbuf' variable metze --- source3/libsmb/clientgen.c | 3 +-- source3/libsmb/clifile.c | 18 ++++++------------ source3/libsmb/climessage.c | 3 +-- source3/libsmb/clioplock.c | 3 +-- source3/libsmb/clireadwrite.c | 3 +-- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 0bbcdf5c71c..c8bd7e5f528 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -483,9 +483,8 @@ static void cli_echo_done(struct tevent_req *subreq) NTSTATUS status; uint32_t num_bytes; uint8_t *bytes; - uint8_t *inbuf; - status = cli_smb_recv(subreq, state, &inbuf, 0, NULL, NULL, + status = cli_smb_recv(subreq, state, NULL, 0, NULL, NULL, &num_bytes, &bytes); if (!NT_STATUS_IS_OK(status)) { tevent_req_nterror(req, status); diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index b762a377c18..8fdbe15edc1 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -1852,10 +1852,9 @@ static void cli_ntcreate_done(struct tevent_req *subreq) uint16_t *vwv; uint32_t num_bytes; uint8_t *bytes; - uint8_t *inbuf; NTSTATUS status; - status = cli_smb_recv(subreq, state, &inbuf, 3, &wct, &vwv, + status = cli_smb_recv(subreq, state, NULL, 3, &wct, &vwv, &num_bytes, &bytes); TALLOC_FREE(subreq); if (tevent_req_nterror(req, status)) { @@ -2241,10 +2240,9 @@ static void cli_openx_done(struct tevent_req *subreq) req, struct cli_openx_state); uint8_t wct; uint16_t *vwv; - uint8_t *inbuf; NTSTATUS status; - status = cli_smb_recv(subreq, state, &inbuf, 3, &wct, &vwv, NULL, + status = cli_smb_recv(subreq, state, NULL, 3, &wct, &vwv, NULL, NULL); TALLOC_FREE(subreq); if (tevent_req_nterror(req, status)) { @@ -3279,10 +3277,9 @@ static void cli_getattrE_done(struct tevent_req *subreq) req, struct cli_getattrE_state); uint8_t wct; uint16_t *vwv = NULL; - uint8_t *inbuf; NTSTATUS status; - status = cli_smb_recv(subreq, state, &inbuf, 11, &wct, &vwv, + status = cli_smb_recv(subreq, state, NULL, 11, &wct, &vwv, NULL, NULL); TALLOC_FREE(subreq); if (tevent_req_nterror(req, status)) { @@ -3439,10 +3436,9 @@ static void cli_getatr_done(struct tevent_req *subreq) req, struct cli_getatr_state); uint8_t wct; uint16_t *vwv = NULL; - uint8_t *inbuf; NTSTATUS status; - status = cli_smb_recv(subreq, state, &inbuf, 4, &wct, &vwv, NULL, + status = cli_smb_recv(subreq, state, NULL, 4, &wct, &vwv, NULL, NULL); TALLOC_FREE(subreq); if (tevent_req_nterror(req, status)) { @@ -3922,10 +3918,9 @@ static void cli_dskattr_done(struct tevent_req *subreq) req, struct cli_dskattr_state); uint8_t wct; uint16_t *vwv = NULL; - uint8_t *inbuf; NTSTATUS status; - status = cli_smb_recv(subreq, state, &inbuf, 4, &wct, &vwv, NULL, + status = cli_smb_recv(subreq, state, NULL, 4, &wct, &vwv, NULL, NULL); TALLOC_FREE(subreq); if (tevent_req_nterror(req, status)) { @@ -4052,9 +4047,8 @@ static void cli_ctemp_done(struct tevent_req *subreq) uint16_t *vwv; uint32_t num_bytes = 0; uint8_t *bytes = NULL; - uint8_t *inbuf; - status = cli_smb_recv(subreq, state, &inbuf, 1, &wcnt, &vwv, + status = cli_smb_recv(subreq, state, NULL, 1, &wcnt, &vwv, &num_bytes, &bytes); TALLOC_FREE(subreq); if (tevent_req_nterror(req, status)) { diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c index 6c562fa2903..4e99761bf3a 100644 --- a/source3/libsmb/climessage.c +++ b/source3/libsmb/climessage.c @@ -97,9 +97,8 @@ static void cli_message_start_done(struct tevent_req *subreq) NTSTATUS status; uint8_t wct; uint16_t *vwv; - uint8_t *inbuf; - status = cli_smb_recv(subreq, state, &inbuf, 0, &wct, &vwv, + status = cli_smb_recv(subreq, state, NULL, 0, &wct, &vwv, NULL, NULL); TALLOC_FREE(subreq); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c index 2c5ec0b8b30..0b3ca2c0add 100644 --- a/source3/libsmb/clioplock.c +++ b/source3/libsmb/clioplock.c @@ -71,10 +71,9 @@ static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq) uint16_t *vwv; uint32_t num_bytes; uint8_t *bytes; - uint8_t *inbuf; NTSTATUS status; - status = cli_smb_recv(subreq, state, &inbuf, 8, &wct, &vwv, + status = cli_smb_recv(subreq, state, NULL, 8, &wct, &vwv, &num_bytes, &bytes); TALLOC_FREE(subreq); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index b7ee7d59114..3cc6cf8047c 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -923,10 +923,9 @@ static void cli_write_andx_done(struct tevent_req *subreq) req, struct cli_write_andx_state); uint8_t wct; uint16_t *vwv; - uint8_t *inbuf; NTSTATUS status; - status = cli_smb_recv(subreq, state, &inbuf, 6, &wct, &vwv, + status = cli_smb_recv(subreq, state, NULL, 6, &wct, &vwv, NULL, NULL); TALLOC_FREE(subreq); if (NT_STATUS_IS_ERR(status)) { -- 2.11.4.GIT