From 21528da9cd12a4f5c3792a482a5d18fe946a6f7a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 17 Feb 2012 14:12:40 -0800 Subject: Fix a bunch of "unused variable" warnings. Autobuild-User: Jeremy Allison Autobuild-Date: Sat Feb 18 06:22:40 CET 2012 on sn-devel-104 --- source3/smbd/process.c | 3 --- source3/smbd/reply.c | 2 -- source3/smbd/smb2_close.c | 2 -- source3/smbd/smb2_create.c | 4 ---- source3/smbd/smb2_find.c | 4 ---- source3/smbd/smb2_getinfo.c | 4 ---- source3/smbd/smb2_ioctl.c | 3 --- source3/smbd/smb2_notify.c | 3 --- source3/smbd/smb2_read.c | 4 ---- source3/smbd/smb2_server.c | 2 -- source3/smbd/smb2_write.c | 4 ---- source3/smbd/trans2.c | 2 -- 12 files changed, 37 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 1d74355289..139f1f0d22 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -2646,7 +2646,6 @@ static bool smbd_echo_reply(struct smbd_echo_state *state, { struct smb_request req; uint16_t num_replies; - size_t out_len; char *outbuf; bool ok; @@ -2703,8 +2702,6 @@ static bool smbd_echo_reply(struct smbd_echo_state *state, memcpy(smb_buf(req.outbuf), req.buf, req.buflen); } - out_len = smb_len(req.outbuf) + 4; - ok = srv_send_smb(req.sconn, (char *)outbuf, true, seqnum+1, diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 557a32f054..b026d34c67 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3525,10 +3525,8 @@ static int setup_readX_header(struct smb_request *req, char *outbuf, size_t smb_maxcnt) { int outsize; - char *data; outsize = srv_set_message(outbuf,12,smb_maxcnt,False); - data = smb_buf(outbuf); memset(outbuf+smb_vwv0,'\0',24); /* valgrind init. */ diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c index ffe08cc8ac..2cc8266fe1 100644 --- a/source3/smbd/smb2_close.c +++ b/source3/smbd/smb2_close.c @@ -32,7 +32,6 @@ NTSTATUS smbd_smb2_request_process_close(struct smbd_smb2_request *req) { const uint8_t *inbody; int i = req->current_idx; - uint8_t *outhdr; DATA_BLOB outbody; uint16_t in_flags; uint64_t in_file_id_persistent; @@ -68,7 +67,6 @@ NTSTATUS smbd_smb2_request_process_close(struct smbd_smb2_request *req) return smbd_smb2_request_error(req, status); } - outhdr = (uint8_t *)req->out.vector[i].iov_base; return smbd_smb2_request_done(req, outbody, NULL); } diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index c637adbb61..3e5b81d5c8 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -264,8 +264,6 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq) { struct smbd_smb2_request *smb2req = tevent_req_callback_data(tsubreq, struct smbd_smb2_request); - int i = smb2req->current_idx; - uint8_t *outhdr; DATA_BLOB outbody; DATA_BLOB outdyn; uint8_t out_oplock_level = 0; @@ -337,8 +335,6 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq) out_context_buffer_offset = SMB2_HDR_BODY + 0x58; } - outhdr = (uint8_t *)smb2req->out.vector[i].iov_base; - outbody = data_blob_talloc(smb2req->out.vector, NULL, 0x58); if (outbody.data == NULL) { error = smbd_smb2_request_error(smb2req, NT_STATUS_NO_MEMORY); diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c index 671b5f5a75..7c19d7538a 100644 --- a/source3/smbd/smb2_find.c +++ b/source3/smbd/smb2_find.c @@ -142,8 +142,6 @@ static void smbd_smb2_request_find_done(struct tevent_req *subreq) { struct smbd_smb2_request *req = tevent_req_callback_data(subreq, struct smbd_smb2_request); - int i = req->current_idx; - uint8_t *outhdr; DATA_BLOB outbody; DATA_BLOB outdyn; uint16_t out_output_buffer_offset; @@ -167,8 +165,6 @@ static void smbd_smb2_request_find_done(struct tevent_req *subreq) out_output_buffer_offset = SMB2_HDR_BODY + 0x08; - outhdr = (uint8_t *)req->out.vector[i].iov_base; - outbody = data_blob_talloc(req->out.vector, NULL, 0x08); if (outbody.data == NULL) { error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY); diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c index 340130e2a5..7d0f946898 100644 --- a/source3/smbd/smb2_getinfo.c +++ b/source3/smbd/smb2_getinfo.c @@ -125,8 +125,6 @@ static void smbd_smb2_request_getinfo_done(struct tevent_req *subreq) { struct smbd_smb2_request *req = tevent_req_callback_data(subreq, struct smbd_smb2_request); - int i = req->current_idx; - uint8_t *outhdr; DATA_BLOB outbody; DATA_BLOB outdyn; uint16_t out_output_buffer_offset; @@ -166,8 +164,6 @@ static void smbd_smb2_request_getinfo_done(struct tevent_req *subreq) out_output_buffer_offset = SMB2_HDR_BODY + 0x08; - outhdr = (uint8_t *)req->out.vector[i].iov_base; - outbody = data_blob_talloc(req->out.vector, NULL, 0x08); if (outbody.data == NULL) { error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY); diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c index 56d9a3267f..d537a8798c 100644 --- a/source3/smbd/smb2_ioctl.c +++ b/source3/smbd/smb2_ioctl.c @@ -119,7 +119,6 @@ static void smbd_smb2_request_ioctl_done(struct tevent_req *subreq) struct smbd_smb2_request); const uint8_t *inbody; int i = req->current_idx; - uint8_t *outhdr; DATA_BLOB outbody; DATA_BLOB outdyn; uint32_t in_ctl_code; @@ -160,8 +159,6 @@ static void smbd_smb2_request_ioctl_done(struct tevent_req *subreq) in_file_id_persistent = BVAL(inbody, 0x08); in_file_id_volatile = BVAL(inbody, 0x10); - outhdr = (uint8_t *)req->out.vector[i].iov_base; - outbody = data_blob_talloc(req->out.vector, NULL, 0x30); if (outbody.data == NULL) { error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY); diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c index 0ea0b09636..49051bfe62 100644 --- a/source3/smbd/smb2_notify.c +++ b/source3/smbd/smb2_notify.c @@ -103,7 +103,6 @@ static void smbd_smb2_request_notify_done(struct tevent_req *subreq) struct smbd_smb2_request *req = tevent_req_callback_data(subreq, struct smbd_smb2_request); int i = req->current_idx; - uint8_t *outhdr; DATA_BLOB outbody; DATA_BLOB outdyn; uint16_t out_output_buffer_offset; @@ -145,8 +144,6 @@ static void smbd_smb2_request_notify_done(struct tevent_req *subreq) out_output_buffer_offset = SMB2_HDR_BODY + 0x08; - outhdr = (uint8_t *)req->out.vector[i].iov_base; - outbody = data_blob_talloc(req->out.vector, NULL, 0x08); if (outbody.data == NULL) { error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY); diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index 358d307427..13bcbdfd19 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -107,8 +107,6 @@ static void smbd_smb2_request_read_done(struct tevent_req *subreq) { struct smbd_smb2_request *req = tevent_req_callback_data(subreq, struct smbd_smb2_request); - int i = req->current_idx; - uint8_t *outhdr; DATA_BLOB outbody; DATA_BLOB outdyn; uint8_t out_data_offset; @@ -134,8 +132,6 @@ static void smbd_smb2_request_read_done(struct tevent_req *subreq) out_data_offset = SMB2_HDR_BODY + 0x10; - outhdr = (uint8_t *)req->out.vector[i].iov_base; - outbody = data_blob_talloc(req->out.vector, NULL, 0x10); if (outbody.data == NULL) { error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY); diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index a51e26ddb9..899de07c23 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -554,7 +554,6 @@ static NTSTATUS smbd_smb2_request_setup_out(struct smbd_smb2_request *req) for (idx=1; idx < count; idx += 3) { const uint8_t *inhdr = NULL; - uint32_t in_flags; uint8_t *outhdr = NULL; uint8_t *outbody = NULL; uint32_t next_command_ofs = 0; @@ -567,7 +566,6 @@ static NTSTATUS smbd_smb2_request_setup_out(struct smbd_smb2_request *req) } inhdr = (const uint8_t *)req->in.vector[idx].iov_base; - in_flags = IVAL(inhdr, SMB2_HDR_FLAGS); outhdr = talloc_zero_array(vector, uint8_t, OUTVEC_ALLOC_SIZE); diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c index 23e344f6a0..49a77e63a9 100644 --- a/source3/smbd/smb2_write.c +++ b/source3/smbd/smb2_write.c @@ -114,8 +114,6 @@ static void smbd_smb2_request_write_done(struct tevent_req *subreq) { struct smbd_smb2_request *req = tevent_req_callback_data(subreq, struct smbd_smb2_request); - int i = req->current_idx; - uint8_t *outhdr; DATA_BLOB outbody; DATA_BLOB outdyn; uint32_t out_count = 0; @@ -134,8 +132,6 @@ static void smbd_smb2_request_write_done(struct tevent_req *subreq) return; } - outhdr = (uint8_t *)req->out.vector[i].iov_base; - outbody = data_blob_talloc(req->out.vector, NULL, 0x10); if (outbody.data == NULL) { error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY); diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index cee6c35189..336e76e481 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1539,7 +1539,6 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, uint32_t len; struct timespec mdate_ts, adate_ts, cdate_ts, create_date_ts; time_t mdate = (time_t)0, adate = (time_t)0, create_date = (time_t)0; - time_t c_date = (time_t)0; char *nameptr; char *last_entry_ptr; bool was_8_3; @@ -1575,7 +1574,6 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, create_date = convert_timespec_to_time_t(create_date_ts); mdate = convert_timespec_to_time_t(mdate_ts); adate = convert_timespec_to_time_t(adate_ts); - c_date = convert_timespec_to_time_t(cdate_ts); /* align the record */ SMB_ASSERT(align >= 1); -- cgit