1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileSystemEngine/Unix: fix unneeded casts from errno values to int

Browse Source 
In the same file, errno and EACCES are passed unadorned to
qt_error_string(), proving the int casts on the other calls aren't
necessary.

Remove them; ints are a code smell these days.

Task-number: QTBUG-103525
Change-Id: I7209a209141195090878944ae66da3c85bbe4135
Reviewed-by: Mate Barany <mate.barany@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 8b514c9c588f5570526c9ce0376bffbf431843f8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2022-08-18 16:03:29 +02:00 committed by Qt Cherry-pick Bot
parent 398d5d6038
commit 7fbe08538a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/io/qfsfileengine_unix.cpp
View File

@ -122,7 +122,7 @@ bool QFSFileEnginePrivate::nativeOpenImpl(QIODevice::OpenMode openMode, mode_t m
if (ret == -1) { if (ret == -1) {
q->setError(errno == EMFILE ? QFile::ResourceError : QFile::OpenError, q->setError(errno == EMFILE ? QFile::ResourceError : QFile::OpenError,
qt_error_string(int(errno))); qt_error_string(errno));
return false; return false;
} }
} }
@ -221,7 +221,7 @@ qint64 QFSFileEnginePrivate::nativeRead(char *data, qint64 len)
} }
if (readBytes == 0 && !feof(fh)) { if (readBytes == 0 && !feof(fh)) {
// if we didn't read anything and we're not at EOF, it must be an error // if we didn't read anything and we're not at EOF, it must be an error
q->setError(QFile::ReadError, qt_error_string(int(errno))); q->setError(QFile::ReadError, qt_error_string(errno));
return -1; return -1;
} }
return readBytes; return readBytes;
@ -550,13 +550,13 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
Q_Q(QFSFileEngine); Q_Q(QFSFileEngine);
if (openMode == QIODevice::NotOpen) { if (openMode == QIODevice::NotOpen) {
q->setError(QFile::PermissionsError, qt_error_string(int(EACCES))); q->setError(QFile::PermissionsError, qt_error_string(EACCES));
return nullptr; return nullptr;
} }
if (offset < 0 || offset > maxFileOffset if (offset < 0 || offset > maxFileOffset
|| size < 0 || quint64(size) > quint64(size_t(-1))) { || size < 0 || quint64(size) > quint64(size_t(-1))) {
q->setError(QFile::UnspecifiedError, qt_error_string(int(EINVAL))); q->setError(QFile::UnspecifiedError, qt_error_string(EINVAL));
return nullptr; return nullptr;
} }
@ -584,7 +584,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
int extra = offset % pageSize; int extra = offset % pageSize;
if (quint64(size + extra) > quint64((size_t)-1)) { if (quint64(size + extra) > quint64((size_t)-1)) {
q->setError(QFile::UnspecifiedError, qt_error_string(int(EINVAL))); q->setError(QFile::UnspecifiedError, qt_error_string(EINVAL));
return nullptr; return nullptr;
} }
@ -602,16 +602,16 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
switch(errno) { switch(errno) {
case EBADF: case EBADF:
q->setError(QFile::PermissionsError, qt_error_string(int(EACCES))); q->setError(QFile::PermissionsError, qt_error_string(EACCES));
break; break;
case ENFILE: case ENFILE:
case ENOMEM: case ENOMEM:
q->setError(QFile::ResourceError, qt_error_string(int(errno))); q->setError(QFile::ResourceError, qt_error_string(errno));
break; break;
case EINVAL: case EINVAL:
// size are out of bounds // size are out of bounds
default: default:
q->setError(QFile::UnspecifiedError, qt_error_string(int(errno))); q->setError(QFile::UnspecifiedError, qt_error_string(errno));
break; break;
} }
return nullptr; return nullptr;