whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QStorageInfo/Linux: don't copy the mount info's contents until the end 

All these where somewhat cheap to copy (QStrings and QByteArrays), but
why copy multiple times at all? Just copy at the end.

Pick-to: 6.6
Change-Id: I9d43e5b91eb142d6945cfffd1787497434632dd4
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Thiago Macieira 2023-09-22 10:42:28 -07:00
parent c8d31833f0
commit 914b3bc985
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/io/qstorageinfo_linux.cpp
View File

@ -139,17 +139,21 @@ void QStorageInfoPrivate::initRootPath()
const QString oldRootPath = rootPath;
rootPath.clear();
for (auto &info : infos) {
const MountInfo *bestInfo = nullptr;
for (const MountInfo &info : infos) {
// we try to find most suitable entry
qsizetype mpSize = info.mountPoint.size();
if (isParentOf(info.mountPoint, oldRootPath) && maxLength < mpSize) {
bestInfo = &info;
maxLength = mpSize;
rootPath = info.mountPoint;
device = info.device;
fileSystemType = info.fsType;
subvolume = info.fsRoot;
}
}
if (bestInfo) {
rootPath = bestInfo->mountPoint;
device = bestInfo->device;
fileSystemType = bestInfo->fsType;
subvolume = bestInfo->fsRoot;
}
}
QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes()