From a5f8061c2ae7abeb44c538e1ba08ffcb6795d8d7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 21 Mar 2008 19:55:31 +0100 Subject: [PATCH] Returned size is also SMB_OFF_T Get the bytes/second calculation right for bug 5341 --- source/client/client.c | 2 +- source/libsmb/clireadwrite.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/client/client.c b/source/client/client.c index 0b4438d..882ed4d 100644 --- a/source/client/client.c +++ b/source/client/client.c @@ -981,7 +981,7 @@ static int do_get(const char *rname, const char *lname_in, bool reget) uint16 attr; SMB_OFF_T size; off_t start = 0; - ssize_t nread = 0; + SMB_OFF_T nread = 0; int rc = 0; struct cli_state *targetcli = NULL; char *targetname = NULL; diff --git a/source/libsmb/clireadwrite.c b/source/libsmb/clireadwrite.c index f292fcb..c9cf927 100644 --- a/source/libsmb/clireadwrite.c +++ b/source/libsmb/clireadwrite.c @@ -191,7 +191,7 @@ struct cli_pull_state { /* * For how many bytes did we send requests already? */ - off_t requested; + SMB_OFF_T requested; /* * Next request index to push into "sink". This walks around the "req" @@ -205,7 +205,7 @@ struct cli_pull_state { * How many bytes did we push into "sink"? */ - off_t pushed; + SMB_OFF_T pushed; }; static char *cli_pull_print(TALLOC_CTX *mem_ctx, struct async_req *req) @@ -231,7 +231,7 @@ static void cli_pull_read_done(struct async_req *read_req); */ struct async_req *cli_pull_send(TALLOC_CTX *mem_ctx, struct cli_state *cli, - uint16_t fnum, off_t start_offset, + uint16_t fnum, SMB_OFF_T start_offset, SMB_OFF_T size, size_t window_size, NTSTATUS (*sink)(char *buf, size_t n, void *priv), @@ -426,9 +426,9 @@ NTSTATUS cli_pull_recv(struct async_req *req, ssize_t *received) } NTSTATUS cli_pull(struct cli_state *cli, uint16_t fnum, - off_t start_offset, SMB_OFF_T size, size_t window_size, + SMB_OFF_T start_offset, SMB_OFF_T size, size_t window_size, NTSTATUS (*sink)(char *buf, size_t n, void *priv), - void *priv, ssize_t *received) + void *priv, SMB_OFF_T *received) { TALLOC_CTX *frame = talloc_stackframe(); struct async_req *req; -- 1.5.3.6