summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorLuk Claes <luk@debian.org>2012-05-19 18:35:51 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-28 14:49:47 +0200
commit6c18a66f3e84b8587deb25390e5ee9f6d531a3be (patch)
treec642fffcf70e70410edc0116685bbdf25817a684 /source3
parent7c69ca09d0a847262b3e5981c12331c70bf1ce35 (diff)
downloadsamba-6c18a66f3e84b8587deb25390e5ee9f6d531a3be.tar.gz
samba-6c18a66f3e84b8587deb25390e5ee9f6d531a3be.tar.bz2
samba-6c18a66f3e84b8587deb25390e5ee9f6d531a3be.zip
s3:libsmb: get rid of cli_state_max_requests
Signed-off-by: Luk Claes <luk@debian.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/clientgen.c5
-rw-r--r--source3/libsmb/clireadwrite.c4
-rw-r--r--source3/libsmb/proto.h1
3 files changed, 2 insertions, 8 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 92a62bb437..d627f7520b 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -443,11 +443,6 @@ uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs)
return ret;
}
-uint16_t cli_state_max_requests(struct cli_state *cli)
-{
- return smbXcli_conn_max_requests(cli->conn);
-}
-
const uint8_t *cli_state_server_challenge(struct cli_state *cli)
{
return smb1cli_conn_server_challenge(cli->conn);
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index ac200c7ffd..5e2e94345d 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -513,7 +513,7 @@ struct tevent_req *cli_pull_send(TALLOC_CTX *mem_ctx,
state->chunk_size &= ~(page_size - 1);
}
- state->max_reqs = cli_state_max_requests(cli);
+ state->max_reqs = smbXcli_conn_max_requests(cli->conn);
state->num_reqs = MAX(window_size/state->chunk_size, 1);
state->num_reqs = MIN(state->num_reqs, state->max_reqs);
@@ -1215,7 +1215,7 @@ struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
state->chunk_size &= ~(page_size - 1);
}
- state->max_reqs = cli_state_max_requests(cli);
+ state->max_reqs = smbXcli_conn_max_requests(cli->conn);
if (window_size == 0) {
window_size = state->max_reqs * state->chunk_size;
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 294e2a7b76..f633ed1e84 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -182,7 +182,6 @@ uint16_t cli_state_get_uid(struct cli_state *cli);
uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid);
bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive);
uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs);
-uint16_t cli_state_max_requests(struct cli_state *cli);
const uint8_t *cli_state_server_challenge(struct cli_state *cli);
const DATA_BLOB *cli_state_server_gss_blob(struct cli_state *cli);
uint16_t cli_state_security_mode(struct cli_state *cli);