s3-client/clitar.c: replace cli_read_old() with cli_read()
authorBjörn Baumbach <bb@sernet.de>
Fri, 22 Jul 2011 10:35:03 +0000 (12:35 +0200)
committerStefan Metzmacher <metze@samba.org>
Sat, 23 Jul 2011 07:18:26 +0000 (09:18 +0200)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
source3/client/clitar.c

index 88824617a0fe3545de5f7125589520418955da6a..cc642c330e5d72981f59ed791b4b4cbb37df5ddf 100644 (file)
@@ -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;