From 4974742bb85b5f22ade3e1a59c2b5fe7ac84e684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@trolltech.com>
Date: Wed, 13 Jan 2010 18:13:11 +0100
Subject: QFile::readData: Simplify code

Reviewed-by: Markus Goetz
---
 src/corelib/io/qfile.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index df470b9..728c316 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -1517,18 +1517,14 @@ qint64 QFile::readData(char *data, qint64 len)
     if (!d->ensureFlushed())
         return -1;
 
-    qint64 ret = -1;
     qint64 read = d->fileEngine->read(data, len);
-    if (read != -1)
-        ret = read;
-
-    if(ret < 0) {
+    if(read < 0) {
         QFile::FileError err = d->fileEngine->error();
         if(err == QFile::UnspecifiedError)
             err = QFile::ReadError;
         d->setError(err, d->fileEngine->errorString());
     }
-    return ret;
+    return read;
 }
 
 /*!
-- 
cgit v0.12