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>

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 540600778474e81be054b6cab71bdefe441617c2..413668d108173a1dc94eee039d7d6f715d96192a 100644 (file)
--- 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 7924091935a2954c2c861c724b4a18e6be31fd22..6f2ba3ce4c78bafdeb43ea77db39675ef2a10943 100644 (file)
--- 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);