From 41d830ea4fb8bf7cb20e08607ba9db9f53c03880 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 8 Jun 2012 16:06:24 +0200 Subject: [PATCH] s3:smbd: remove unnecessary variable readret from read_file() Pair-Programmed-With: Volker Lendecke Autobuild-User(master): Michael Adam Autobuild-Date(master): Fri Jun 8 18:08:09 CEST 2012 on sn-devel-104 --- source3/smbd/fileio.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c index 8fc73427071..a14be7806a0 100644 --- a/source3/smbd/fileio.c +++ b/source3/smbd/fileio.c @@ -64,7 +64,7 @@ static bool read_from_write_cache(files_struct *fsp,char *data,off_t pos,size_t ssize_t read_file(files_struct *fsp,char *data,off_t pos,size_t n) { - ssize_t ret=0,readret; + ssize_t ret = 0; /* you can't read from print files */ if (fsp->print_file) { @@ -87,15 +87,11 @@ ssize_t read_file(files_struct *fsp,char *data,off_t pos,size_t n) fsp->fh->pos = pos; if (n > 0) { - readret = SMB_VFS_PREAD(fsp,data,n,pos); + ret = SMB_VFS_PREAD(fsp,data,n,pos); - if (readret == -1) { + if (ret == -1) { return -1; } - - if (readret > 0) { - ret += readret; - } } DEBUG(10,("read_file (%s): pos = %.0f, size = %lu, returned %lu\n",