diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-08-05 06:24:25 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-08-05 19:29:25 +0200 |
commit | 60c7fe6fb52d68db8f0b707dbf918860b4f90de3 (patch) | |
tree | 0b4960a957635e141637c90791350ca5e92ef132 | |
parent | 1124c39bc8db6c4cf55f30219c29536a2be349d8 (diff) |
Port qenvironmentvariables.cpp to qsizetype
I don't expect environments to allow values or names > 2 Gi
characters, so this is just for consistency (int is a code smell these
days).
As a drive-by, replace
QString buffer;
buffer.resize(n);
with
QString buffer(n, Qt::Uninitialized);
Task-number: QTBUG-103527
Change-Id: I0e41a6e7e9c44ff1ec22377329735538d5f95181
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit c25cc34a05c0838052b9a5d6624336ef2a2ae8ea)
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
-rw-r--r-- | src/corelib/global/qglobal.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 4b74dd17c2..30d3341318 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -3439,7 +3439,7 @@ QByteArray qgetenv(const char *varName) getenv_s(&requiredSize, 0, 0, varName); if (requiredSize == 0) return buffer; - buffer.resize(int(requiredSize)); + buffer.resize(qsizetype(requiredSize)); getenv_s(&requiredSize, buffer.data(), requiredSize, varName); // requiredSize includes the terminating null, which we don't want. Q_ASSERT(buffer.endsWith('\0')); @@ -3500,15 +3500,14 @@ QString qEnvironmentVariable(const char *varName, const QString &defaultValue) { #if defined(Q_OS_WIN) const auto locker = qt_scoped_lock(environmentMutex); - QVarLengthArray<wchar_t, 32> wname(int(strlen(varName)) + 1); - for (int i = 0; i < wname.size(); ++i) // wname.size() is correct: will copy terminating null + QVarLengthArray<wchar_t, 32> wname(qsizetype(strlen(varName)) + 1); + for (qsizetype i = 0; i < wname.size(); ++i) // wname.size() is correct: will copy terminating null wname[i] = uchar(varName[i]); size_t requiredSize = 0; - QString buffer; _wgetenv_s(&requiredSize, 0, 0, wname.data()); if (requiredSize == 0) return defaultValue; - buffer.resize(int(requiredSize)); + QString buffer(qsizetype(requiredSize), Qt::Uninitialized); _wgetenv_s(&requiredSize, reinterpret_cast<wchar_t *>(buffer.data()), requiredSize, wname.data()); // requiredSize includes the terminating null, which we don't want. |