Skip to content

Commit 0d4f154

Browse files
committed
Chore: fix code smell
1 parent e68a947 commit 0d4f154

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

src/detection/disk/disk_bsd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static const char* detectFsLabel(struct statfs* fs, FFDisk* disk)
3636
return "geom_gettree() failed";
3737
}
3838

39-
for (cLabels = geomTree.lg_class.lh_first; !ffStrEquals(cLabels->lg_name, "LABEL"); cLabels = cLabels->lg_class.le_next);
39+
for (cLabels = geomTree.lg_class.lh_first; cLabels && !ffStrEquals(cLabels->lg_name, "LABEL"); cLabels = cLabels->lg_class.le_next);
4040
if (!cLabels)
4141
return "Class LABEL is not found";
4242
}
@@ -165,7 +165,7 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
165165
disk->bytesUsed = 0; // To be filled in ./disk.c
166166

167167
disk->filesTotal = (uint32_t) fs->f_files;
168-
disk->filesUsed = (uint32_t) (disk->filesTotal - (uint64_t)fs->f_ffree);
168+
disk->filesUsed = (uint32_t) (fs->f_files - fs->f_ffree);
169169

170170
ffStrbufInitS(&disk->mountFrom, fs->f_mntfromname);
171171
ffStrbufInitS(&disk->mountpoint, fs->f_mntonname);
@@ -185,7 +185,7 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
185185
#ifndef __DragonFly__
186186
struct stat st;
187187
if(stat(fs->f_mntonname, &st) == 0 && st.st_birthtimespec.tv_sec > 0)
188-
disk->createTime = (uint64_t)((st.st_birthtimespec.tv_sec * 1000) + (st.st_birthtimespec.tv_nsec / 1000000));
188+
disk->createTime = (uint64_t)(((uint64_t) st.st_birthtimespec.tv_sec * 1000) + (st.st_birthtimespec.tv_nsec / 1000000));
189189
#endif
190190
}
191191

src/detection/disk/disk_haiku.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
1414
for (dev_t dev; (dev = next_dev(&pos)) >= B_OK;)
1515
{
1616
fs_info fs;
17-
if (fs_stat_dev(dev, &fs) < -1) continue;
17+
if (fs_stat_dev(dev, &fs) < 0) continue;
1818

1919
node_ref node(fs.dev, fs.root);
2020
BDirectory dir(&node);
@@ -32,10 +32,10 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
3232
disk->bytesTotal = (uint64_t)fs.total_blocks * (uint64_t) fs.block_size;
3333
disk->bytesFree = (uint64_t)fs.free_blocks * (uint64_t) fs.block_size;
3434
disk->bytesAvailable = disk->bytesFree;
35-
disk->bytesUsed = 0; // To be filled in ./disk. c
35+
disk->bytesUsed = 0; // To be filled in ./disk.c
3636

3737
disk->filesTotal = (uint32_t) fs.total_nodes;
38-
disk->filesUsed = (uint32_t) (disk->filesTotal - (uint64_t)fs.free_nodes);
38+
disk->filesUsed = (uint32_t) (fs.total_nodes - fs.free_nodes);
3939

4040
ffStrbufInitS(&disk->mountFrom, fs.device_name);
4141
ffStrbufInitS(&disk->mountpoint, path.Path());

src/detection/disk/disk_linux.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ static bool isRemovable(FFDisk* currentDisk)
209209
char sysBlockVolume[PATH_MAX]; // /sys/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host0/target0:0:0/0:0:0:0/block/sda/sda1
210210
if (realpath(sysBlockPartition, sysBlockVolume) == NULL)
211211
return false;
212-
strcpy(strrchr(sysBlockVolume, '/') + 1, "removable");
212+
char* lastSlash = strrchr(sysBlockVolume, '/');
213+
if (lastSlash == NULL)
214+
return false;
215+
strcpy(lastSlash + 1, "removable");
213216

214217
char removableChar = '0';
215218
return ffReadFileData(sysBlockVolume, 1, &removableChar) > 0 && removableChar == '1';

src/detection/diskio/diskio_bsd.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@
1313

1414
const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
1515
{
16-
struct gmesh geomTree;
16+
__attribute__((__cleanup__(geom_deletetree)))
17+
struct gmesh geomTree = {};
1718
if (geom_gettree(&geomTree) < 0)
1819
return "geom_gettree() failed";
1920

2021
if (geom_stats_open() < 0)
2122
return "geom_stats_open() failed";
2223

2324
void* snap = geom_stats_snapshot_get();
25+
if (!snap)
26+
return "geom_stats_snapshot_get() failed";
27+
2428
struct devstat* snapIter;
2529
while ((snapIter = geom_stats_snapshot_next(snap)) != NULL)
2630
{

0 commit comments

Comments
 (0)