sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3:smbd: remove unnecessary variable readret from read_file()

Browse Source 
Pair-Programmed-With: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Fri Jun  8 18:08:09 CEST 2012 on sn-devel-104
This commit is contained in:
Michael Adam 2012-06-08 16:06:24 +02:00
parent eb750d5458
commit 41d830ea4f
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/smbd/fileio.c
View File

@ -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 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 */ /* you can't read from print files */
if (fsp->print_file) { 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; fsp->fh->pos = pos;
if (n > 0) { 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; return -1;
} }
if (readret > 0) {
ret += readret;
}
} }
DEBUG(10,("read_file (%s): pos = %.0f, size = %lu, returned %lu\n", DEBUG(10,("read_file (%s): pos = %.0f, size = %lu, returned %lu\n",