summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2011-07-19 10:48:16 +0200
committerStefan Metzmacher <metze@samba.org>2011-07-20 22:09:25 +0200
commit9b168e128a74b7e816a6eea73d1b8db8b915b701 (patch)
tree67aebe2769008c3b641f32cc438c2768b98fc7dc /source3/libsmb
parent8f41e54d538896a929ef8ebf224ddcfea7982ba8 (diff)
downloadsamba-9b168e128a74b7e816a6eea73d1b8db8b915b701.tar.gz
samba-9b168e128a74b7e816a6eea73d1b8db8b915b701.tar.bz2
samba-9b168e128a74b7e816a6eea73d1b8db8b915b701.zip
s3-libsmb: replace cli_read() with cli_read_old()
Will introduce new cli_read() function. Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/clireadwrite.c2
-rw-r--r--source3/libsmb/libsmb_file.c2
-rw-r--r--source3/libsmb/proto.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 64bdb484f3..f9c85f6c35 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -691,7 +691,7 @@ static NTSTATUS cli_read_sink(char *buf, size_t n, void *priv)
return NT_STATUS_OK;
}
-ssize_t cli_read(struct cli_state *cli, uint16_t fnum, char *buf,
+ssize_t cli_read_old(struct cli_state *cli, uint16_t fnum, char *buf,
off_t offset, size_t size)
{
NTSTATUS status;
diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index 4517a36f57..ebf49252e8 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -296,7 +296,7 @@ SMBC_read_ctx(SMBCCTX *context,
}
/*d_printf(">>>fstat: resolved path as %s\n", targetpath);*/
- ret = cli_read(targetcli, file->cli_fd, (char *)buf, offset, count);
+ ret = cli_read_old(targetcli, file->cli_fd, (char *)buf, offset, count);
if (ret < 0) {
errno = SMBC_errno(context, targetcli);
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index fe30509bb6..82c9846603 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -738,7 +738,7 @@ NTSTATUS cli_pull(struct cli_state *cli, uint16_t fnum,
off_t start_offset, SMB_OFF_T size, size_t window_size,
NTSTATUS (*sink)(char *buf, size_t n, void *priv),
void *priv, SMB_OFF_T *received);
-ssize_t cli_read(struct cli_state *cli, uint16_t fnum, char *buf,
+ssize_t cli_read_old(struct cli_state *cli, uint16_t fnum, char *buf,
off_t offset, size_t size);
NTSTATUS cli_smbwrite(struct cli_state *cli, uint16_t fnum, char *buf,
off_t offset, size_t size1, size_t *ptotal);