OSDN Git Service

remove redundant pre-processor checks in qt_tildeExpansion()
authorIvailo Monev <xakepa10@gmail.com>
Mon, 21 Dec 2020 21:35:14 +0000 (21:35 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Mon, 21 Dec 2020 21:35:14 +0000 (21:35 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/gui/dialogs/qfiledialog.cpp

index 37241d7..384deda 100644 (file)
@@ -834,13 +834,8 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded
         char buf[size_max];
         struct passwd pw;
         struct passwd *tmpPw;
-        int err = 0;
-#if defined(Q_OS_SOLARIS) && (_POSIX_C_SOURCE - 0 < 199506L)
-        tmpPw = ::getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, size_max);
-#else
-        err = ::getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, size_max, &tmpPw);
-#endif
-        if (err || !tmpPw)
+        ::getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, size_max, &tmpPw);
+        if (!tmpPw)
             return ret;
         const QString homePath = QString::fromLocal8Bit(pw.pw_dir);
 #else