1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00

s3-libsmb/libsmb_file.c: replace cli_read_old() with cli_read()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Björn Baumbach 2011-07-22 14:22:29 +02:00 committed by Stefan Metzmacher
parent 473b16dcbf
commit 8bdbdd46f4

View File

@ -225,7 +225,7 @@ SMBC_read_ctx(SMBCCTX *context,
void *buf,
size_t count)
{
int ret;
size_t ret;
char *server = NULL, *share = NULL, *user = NULL, *password = NULL;
char *path = NULL;
char *targetpath = NULL;
@ -296,9 +296,9 @@ SMBC_read_ctx(SMBCCTX *context,
}
/*d_printf(">>>fstat: resolved path as %s\n", targetpath);*/
ret = cli_read_old(targetcli, file->cli_fd, (char *)buf, offset, count);
if (ret < 0) {
status = cli_read(targetcli, file->cli_fd, (char *)buf, offset,
count, &ret);
if (!NT_STATUS_IS_OK(status)) {
errno = SMBC_errno(context, targetcli);
TALLOC_FREE(frame);
return -1;
@ -306,7 +306,7 @@ SMBC_read_ctx(SMBCCTX *context,
file->offset += ret;
DEBUG(4, (" --> %d\n", ret));
DEBUG(4, (" --> %ld\n", (unsigned long)ret));
TALLOC_FREE(frame);
return ret; /* Success, ret bytes of data ... */