summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2011-07-22 14:23:56 +0200
committerStefan Metzmacher <metze@samba.org>2011-07-23 09:18:56 +0200
commit40e9d0c440fb436f48e854d8b44b31fef47aaee7 (patch)
treea4041ba30af505316a4a0d884278ee159c8a7dca
parent8bdbdd46f4aca2d4a1cc0babf1300b9eb158b8bb (diff)
downloadsamba-40e9d0c440fb436f48e854d8b44b31fef47aaee7.tar.gz
samba-40e9d0c440fb436f48e854d8b44b31fef47aaee7.tar.bz2
samba-40e9d0c440fb436f48e854d8b44b31fef47aaee7.zip
s3-libsmb: finally remove cli_read_old()
Replaced by new cli_read() which returns NTSTATUS instead of ssize_t. Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/libsmb/clireadwrite.c14
-rw-r--r--source3/libsmb/proto.h2
2 files changed, 0 insertions, 16 deletions
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 5406007784..413668d108 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -691,20 +691,6 @@ static NTSTATUS cli_read_sink(char *buf, size_t n, void *priv)
return NT_STATUS_OK;
}
-ssize_t cli_read_old(struct cli_state *cli, uint16_t fnum, char *buf,
- off_t offset, size_t size)
-{
- NTSTATUS status;
- SMB_OFF_T ret;
-
- status = cli_pull(cli, fnum, offset, size, size,
- cli_read_sink, &buf, &ret);
- if (!NT_STATUS_IS_OK(status)) {
- return -1;
- }
- return ret;
-}
-
NTSTATUS cli_read(struct cli_state *cli, uint16_t fnum,
char *buf, off_t offset, size_t size,
size_t *nread)
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 7924091935..6f2ba3ce4c 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -746,8 +746,6 @@ 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_old(struct cli_state *cli, uint16_t fnum, char *buf,
- off_t offset, size_t size);
NTSTATUS cli_read(struct cli_state *cli, uint16_t fnum,
char *buf, off_t offset, size_t size,
size_t *nread);