From 85077cc3201769a3bd1ffa2c1fedb07727c714f6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 30 Mar 2020 07:38:10 +0000 Subject: [PATCH] make qt_error_string() argument non-optional Signed-off-by: Ivailo Monev --- src/core/global/qglobal.cpp | 3 --- src/core/global/qglobal.h.cmake | 2 +- src/network/socket/qnativesocketengine.cpp | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/core/global/qglobal.cpp b/src/core/global/qglobal.cpp index f87d87d5f..f24d51a5b 100644 --- a/src/core/global/qglobal.cpp +++ b/src/core/global/qglobal.cpp @@ -1368,9 +1368,6 @@ static QtMsgHandler handler = 0; // pointer to debug handler QString qt_error_string(int errorCode) { - if (Q_UNLIKELY(errorCode == -1)) - errorCode = errno; - switch (errorCode) { case EACCES: return QString::fromLatin1(QT_TRANSLATE_NOOP("QIODevice", "Permission denied")); diff --git a/src/core/global/qglobal.h.cmake b/src/core/global/qglobal.h.cmake index cd6d3f62c..210bbf85f 100644 --- a/src/core/global/qglobal.h.cmake +++ b/src/core/global/qglobal.h.cmake @@ -641,7 +641,7 @@ Q_CORE_EXPORT void qWarning(const char *, ...) /* print warning message */ #endif ; -Q_CORE_EXPORT QString qt_error_string(int errorCode = -1); +Q_CORE_EXPORT QString qt_error_string(int errorCode); Q_CORE_EXPORT void qCritical(const char *, ...) /* print critical message */ #if (defined(Q_CC_GNU) || defined(Q_CC_CLANG)) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp index 08947dbc2..deb4316e6 100644 --- a/src/network/socket/qnativesocketengine.cpp +++ b/src/network/socket/qnativesocketengine.cpp @@ -825,7 +825,7 @@ qint64 QNativeSocketEngine::read(char *data, qint64 maxSize) if (!d->hasSetSocketError) { d->hasSetSocketError = true; d->socketError = QAbstractSocket::NetworkError; - d->socketErrorString = qt_error_string(); + d->socketErrorString = qt_error_string(errno); } close(); return -1;