fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-08 06:00:08 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Disk: don't use singleton

Browse Source
This commit is contained in:
李通洲
2023-06-12 22:09:52 +08:00
committed by 李通洲
parent 88f354a872
commit d5a3802492
6 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/disk/disk.c
+18 -8
View File
@@ -133,17 +133,27 @@ static void printAutodetected(FFinstance* instance, FFDiskOptions* options, cons
void ffPrintDisk(FFinstance* instance, FFDiskOptions* options)
{
const FFDiskResult* disks = ffDetectDisks();
if(disks->error.length > 0)
FF_LIST_AUTO_DESTROY disks = ffListCreate(sizeof (FFDisk));
const char* error = ffDetectDisks(&disks);
if(error)
{
ffPrintError(instance, FF_DISK_MODULE_NAME, 0, &options->moduleArgs, "%s", disks->error.chars);
return;
ffPrintError(instance, FF_DISK_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
}
else
{
if(options->folders.length == 0)
printAutodetected(instance, options, &disks);
else
printMountpoints(instance, options, &disks);
}
if(options->folders.length == 0)
printAutodetected(instance, options, &disks->disks);
else
printMountpoints(instance, options, &disks->disks);
FF_LIST_FOR_EACH(FFDisk, disk, disks)
{
ffStrbufDestroy(&disk->mountpoint);
ffStrbufDestroy(&disk->filesystem);
ffStrbufDestroy(&disk->name);
}
}