diff options
| author | David Skoland <david.skoland@qt.io> | 2021-10-08 09:47:46 +0200 |
|---|---|---|
| committer | David Skoland <david.skoland@qt.io> | 2021-10-11 15:46:46 +0200 |
| commit | 3fc58a5ed837bc5135198a05255ca7ac72ced69e (patch) | |
| tree | a85f170044aa74e7fd93c9a1dbfdec8a0f86d17e /src/corelib/io | |
| parent | 6c4dc722cb9bf765904feefff4fb00bdb0b3dc9f (diff) | |
Remove union in QFileSystemEngine
The need for this union has disappeared at some point during refactoring
It does confuse MemorySanitizer, though, so it's good to remove it.
Change-Id: I5f5050adba302bf96db96d5f303d2a25630543ce
Fixes: QTBUG-97109
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index c8d7170b64..150fb18527 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -406,10 +406,7 @@ bool QFileSystemEngine::fillMetaData(int fd, QFileSystemMetaData &data) data.entryFlags &= ~QFileSystemMetaData::PosixStatFlags; data.knownFlagsMask |= QFileSystemMetaData::PosixStatFlags; - union { - struct statx statxBuffer; - QT_STATBUF statBuffer; - }; + struct statx statxBuffer; int ret = qt_fstatx(fd, &statxBuffer); if (ret != -ENOSYS) { @@ -420,6 +417,8 @@ bool QFileSystemEngine::fillMetaData(int fd, QFileSystemMetaData &data) return false; } + QT_STATBUF statBuffer; + if (QT_FSTAT(fd, &statBuffer) == 0) { data.fillFromStatBuf(statBuffer); return true; |