From 9b168e128a74b7e816a6eea73d1b8db8b915b701 Mon Sep 17 00:00:00 2001 From: Björn Baumbach Date: Tue, 19 Jul 2011 10:48:16 +0200 Subject: s3-libsmb: replace cli_read() with cli_read_old() Will introduce new cli_read() function. Signed-off-by: Stefan Metzmacher --- source3/libsmb/clireadwrite.c | 2 +- source3/libsmb/libsmb_file.c | 2 +- source3/libsmb/proto.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/libsmb') 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); -- cgit