bb11f7a9fa
In main.cpp, the loop is over a local variable which would be const were it not for the multi-step initialization that I didn't want to change. The loop body clearly doesn't modify the container, so port to ranged for loop with std::as_const(). In printvolumes.cpp, the loop _does_ invoke unknown code (through the function pointer passed as the second argument), but, as could be expected, the two users of the function don't pass functions that know about `volumes`: - in the tst_QStorageInfo auto-test, an rvalue `volumes` is passed, so we don't need to analyze the qInfoPrinter function passed there, as it cannot possibly reference the temporary - and in main.cpp of the manual test, we just pass printf (which is technically UB (taking the address of a standard library function), but I don't care right now). Pick-to: 6.6 6.5 Task-number: QTBUG-115839 Change-Id: Ibcd10a0e0b3229d8f2a1d98545d8fa6d473a0f75 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
33 lines
1.4 KiB
C++
33 lines
1.4 KiB
C++
// Copyright (C) 2016 Intel Corporation
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
|
|
|
#include <QtCore/QStorageInfo>
|
|
|
|
void printVolumes(const QList<QStorageInfo> &volumes, int (*printer)(const char *, ...))
|
|
{
|
|
// Sample output:
|
|
// Filesystem (Type) Size Available BSize Label Mounted on
|
|
// /dev/sda2 (ext4) RO 388480 171218 1024 /boot
|
|
// /dev/mapper/system-root (btrfs) RW
|
|
// 214958080 39088272 4096 /
|
|
// /dev/disk1s2 (hfs) RW 488050672 419909696 4096 Macintosh HD2 /Volumes/Macintosh HD2
|
|
|
|
printer("Filesystem (Type) Size Available BSize Label Mounted on\n");
|
|
for (const QStorageInfo &info : volumes) {
|
|
QByteArray fsAndType = info.device();
|
|
if (info.fileSystemType() != fsAndType)
|
|
fsAndType += " (" + info.fileSystemType() + ')';
|
|
|
|
printer("%-19s R%c ", fsAndType.constData(), info.isReadOnly() ? 'O' : 'W');
|
|
if (fsAndType.size() > 19)
|
|
printer("\n%23s", "");
|
|
|
|
printer("%10llu %10llu %5u ", info.bytesTotal() / 1024, info.bytesFree() / 1024, info.blockSize());
|
|
if (!info.subvolume().isEmpty())
|
|
printer("subvol=%-18s ", qPrintable(info.subvolume()));
|
|
else
|
|
printer("%-25s ", qPrintable(info.name()));
|
|
printer("%s\n", qPrintable(info.rootPath()));
|
|
}
|
|
}
|