From: Björn Baumbach <bb@sernet.de>
Date: Fri, 22 Jul 2011 10:35:03 +0000 (+0200)
Subject: s3-client/clitar.c: replace cli_read_old() with cli_read()
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=bffc521a8aa00ece7d330c6735c8ca787c91ba61;p=obnox%2Fsamba%2Fsamba-obnox.git

s3-client/clitar.c: replace cli_read_old() with cli_read()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 88824617a0f..cc642c330e5 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -616,7 +616,7 @@ static NTSTATUS do_atar(const char *rname_in, char *lname,
 	bool shallitime=True;
 	char *data = NULL;
 	int read_size = 65520;
-	int datalen=0;
+	size_t datalen=0;
 	char *rname = NULL;
 	TALLOC_CTX *ctx = talloc_stackframe();
 	NTSTATUS status = NT_STATUS_OK;
@@ -693,10 +693,9 @@ static NTSTATUS do_atar(const char *rname_in, char *lname,
 
 			DEBUG(3,("nread=%.0f\n",(double)nread));
 
-			datalen = cli_read_old(cli, fnum, data, nread, read_size);
-
-			if (datalen == -1) {
-				status = cli_nt_error(cli);
+			status = cli_read(cli, fnum, data, nread,
+					  read_size, &datalen);
+			if (!NT_STATUS_IS_OK(status)) {
 				DEBUG(0,("Error reading file %s : %s\n",
 					 rname, nt_errstr(status)));
 				break;