Skip to content

Commit fd26373

Browse files
CarterLiCarterLi
committed
Global: overall optimization
1 parent 6dc6fd8 commit fd26373

File tree

21 files changed

+126
-131
lines changed

21 files changed

+126
-131
lines changed

‎src/common/font.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static void fontInitPretty(FFfont* font)
5151

5252
for(uint32_t i = 0; i < font->styles.length; i++)
5353
{
54-
ffStrbufAppend(&font->pretty, ffListGet(&font->styles, i));
54+
ffStrbufAppend(&font->pretty, FF_LIST_GET(FFstrbuf, font->styles, i));
5555

5656
if(i < font->styles.length - 1)
5757
ffStrbufAppendS(&font->pretty, ", ");
@@ -86,7 +86,7 @@ void ffFontInitQt(FFfont* font, const char* data)
8686
{
8787
do
8888
{
89-
FFstrbuf* style = ffListAdd(&font->styles);
89+
FFstrbuf* style = (FFstrbuf*) ffListAdd(&font->styles);
9090
ffStrbufInit(style);
9191
data = ffStrbufAppendSUntilC(style, data, ' ');
9292
if (data) data++;
@@ -142,7 +142,7 @@ static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* altern
142142
) {
143143
if(alternativeBuffer == NULL)
144144
{
145-
alternativeBuffer = ffListAdd(&font->styles);
145+
alternativeBuffer = (FFstrbuf*) ffListAdd(&font->styles);
146146
ffStrbufInit(alternativeBuffer);
147147
}
148148

@@ -215,7 +215,7 @@ void ffFontDestroy(FFfont* font)
215215
ffStrbufDestroy(&font->name);
216216
ffStrbufDestroy(&font->size);
217217

218-
for(uint32_t i = 0; i < font->styles.length; i++)
219-
ffStrbufDestroy(ffListGet(&font->styles, i));
218+
FF_LIST_FOR_EACH(FFstrbuf, str, font->styles)
219+
ffStrbufDestroy(str);
220220
ffListDestroy(&font->styles);
221221
}

‎src/common/format.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
4242
break;
4343
case FF_FORMAT_ARG_TYPE_LIST:
4444
{
45-
const FFlist* list = formatarg->value;
45+
const FFlist* list = (const FFlist*) formatarg->value;
4646
for(uint32_t i = 0; i < list->length; i++)
4747
{
48-
ffStrbufAppend(buffer, ffListGet(list, i));
48+
ffStrbufAppend(buffer, FF_LIST_GET(FFstrbuf, *list, i));
4949
if(i < list->length - 1)
5050
ffStrbufAppendS(buffer, ", ");
5151
}
@@ -110,7 +110,7 @@ static inline bool formatArgSet(const FFformatarg* arg)
110110
(arg->type == FF_FORMAT_ARG_TYPE_DOUBLE && *(double*)arg->value > 0.0) || //Also is false for NaN
111111
(arg->type == FF_FORMAT_ARG_TYPE_INT && *(int*)arg->value > 0) ||
112112
(arg->type == FF_FORMAT_ARG_TYPE_STRBUF && ((FFstrbuf*)arg->value)->length > 0) ||
113-
(arg->type == FF_FORMAT_ARG_TYPE_STRING && ffStrSet(arg->value)) ||
113+
(arg->type == FF_FORMAT_ARG_TYPE_STRING && ffStrSet((char*)arg->value)) ||
114114
(arg->type == FF_FORMAT_ARG_TYPE_UINT8 && *(uint8_t*)arg->value > 0) ||
115115
(arg->type == FF_FORMAT_ARG_TYPE_UINT16 && *(uint16_t*)arg->value > 0) ||
116116
(arg->type == FF_FORMAT_ARG_TYPE_UINT && *(uint32_t*)arg->value > 0) ||

‎src/common/modules.c‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5,65 +5,65 @@ static FFModuleBaseInfo* A[] = {
55
};
66

77
static FFModuleBaseInfo* B[] = {
8-
(void*) &instance.config.modules.battery,
9-
(void*) &instance.config.modules.bios,
10-
(void*) &instance.config.modules.bluetooth,
11-
(void*) &instance.config.modules.bluetoothRadio,
12-
(void*) &instance.config.modules.board,
13-
(void*) &instance.config.modules.bootmgr,
14-
(void*) &instance.config.modules.break_,
15-
(void*) &instance.config.modules.brightness,
16-
(void*) &instance.config.modules.btrfs,
8+
(FFModuleBaseInfo*) &instance.config.modules.battery,
9+
(FFModuleBaseInfo*) &instance.config.modules.bios,
10+
(FFModuleBaseInfo*) &instance.config.modules.bluetooth,
11+
(FFModuleBaseInfo*) &instance.config.modules.bluetoothRadio,
12+
(FFModuleBaseInfo*) &instance.config.modules.board,
13+
(FFModuleBaseInfo*) &instance.config.modules.bootmgr,
14+
(FFModuleBaseInfo*) &instance.config.modules.break_,
15+
(FFModuleBaseInfo*) &instance.config.modules.brightness,
16+
(FFModuleBaseInfo*) &instance.config.modules.btrfs,
1717
NULL,
1818
};
1919

2020
static FFModuleBaseInfo* C[] = {
21-
(void*) &instance.config.modules.camera,
22-
(void*) &instance.config.modules.chassis,
23-
(void*) &instance.config.modules.command,
24-
(void*) &instance.config.modules.colors,
25-
(void*) &instance.config.modules.cpu,
26-
(void*) &instance.config.modules.cpuCache,
27-
(void*) &instance.config.modules.cpuUsage,
28-
(void*) &instance.config.modules.cursor,
29-
(void*) &instance.config.modules.custom,
21+
(FFModuleBaseInfo*) &instance.config.modules.camera,
22+
(FFModuleBaseInfo*) &instance.config.modules.chassis,
23+
(FFModuleBaseInfo*) &instance.config.modules.command,
24+
(FFModuleBaseInfo*) &instance.config.modules.colors,
25+
(FFModuleBaseInfo*) &instance.config.modules.cpu,
26+
(FFModuleBaseInfo*) &instance.config.modules.cpuCache,
27+
(FFModuleBaseInfo*) &instance.config.modules.cpuUsage,
28+
(FFModuleBaseInfo*) &instance.config.modules.cursor,
29+
(FFModuleBaseInfo*) &instance.config.modules.custom,
3030
NULL,
3131
};
3232

3333
static FFModuleBaseInfo* D[] = {
34-
(void*) &instance.config.modules.dateTime,
35-
(void*) &instance.config.modules.de,
36-
(void*) &instance.config.modules.display,
37-
(void*) &instance.config.modules.disk,
38-
(void*) &instance.config.modules.diskIo,
39-
(void*) &instance.config.modules.dns,
34+
(FFModuleBaseInfo*) &instance.config.modules.dateTime,
35+
(FFModuleBaseInfo*) &instance.config.modules.de,
36+
(FFModuleBaseInfo*) &instance.config.modules.display,
37+
(FFModuleBaseInfo*) &instance.config.modules.disk,
38+
(FFModuleBaseInfo*) &instance.config.modules.diskIo,
39+
(FFModuleBaseInfo*) &instance.config.modules.dns,
4040
NULL,
4141
};
4242

4343
static FFModuleBaseInfo* E[] = {
44-
(void*) &instance.config.modules.editor,
44+
(FFModuleBaseInfo*) &instance.config.modules.editor,
4545
NULL,
4646
};
4747

4848
static FFModuleBaseInfo* F[] = {
49-
(void*) &instance.config.modules.font,
49+
(FFModuleBaseInfo*) &instance.config.modules.font,
5050
NULL,
5151
};
5252

5353
static FFModuleBaseInfo* G[] = {
54-
(void*) &instance.config.modules.gamepad,
55-
(void*) &instance.config.modules.gpu,
54+
(FFModuleBaseInfo*) &instance.config.modules.gamepad,
55+
(FFModuleBaseInfo*) &instance.config.modules.gpu,
5656
NULL,
5757
};
5858

5959
static FFModuleBaseInfo* H[] = {
60-
(void*) &instance.config.modules.host,
60+
(FFModuleBaseInfo*) &instance.config.modules.host,
6161
NULL,
6262
};
6363

6464
static FFModuleBaseInfo* I[] = {
65-
(void*) &instance.config.modules.icons,
66-
(void*) &instance.config.modules.initSystem,
65+
(FFModuleBaseInfo*) &instance.config.modules.icons,
66+
(FFModuleBaseInfo*) &instance.config.modules.initSystem,
6767
NULL,
6868
};
6969

@@ -72,47 +72,47 @@ static FFModuleBaseInfo* J[] = {
7272
};
7373

7474
static FFModuleBaseInfo* K[] = {
75-
(void*) &instance.config.modules.kernel,
76-
(void*) &instance.config.modules.keyboard,
75+
(FFModuleBaseInfo*) &instance.config.modules.kernel,
76+
(FFModuleBaseInfo*) &instance.config.modules.keyboard,
7777
NULL,
7878
};
7979

8080
static FFModuleBaseInfo* L[] = {
81-
(void*) &instance.config.modules.lm,
82-
(void*) &instance.config.modules.loadavg,
83-
(void*) &instance.config.modules.locale,
84-
(void*) &instance.config.modules.localIP,
81+
(FFModuleBaseInfo*) &instance.config.modules.lm,
82+
(FFModuleBaseInfo*) &instance.config.modules.loadavg,
83+
(FFModuleBaseInfo*) &instance.config.modules.locale,
84+
(FFModuleBaseInfo*) &instance.config.modules.localIP,
8585
NULL,
8686
};
8787

8888
static FFModuleBaseInfo* M[] = {
89-
(void*) &instance.config.modules.media,
90-
(void*) &instance.config.modules.memory,
91-
(void*) &instance.config.modules.monitor,
92-
(void*) &instance.config.modules.mouse,
89+
(FFModuleBaseInfo*) &instance.config.modules.media,
90+
(FFModuleBaseInfo*) &instance.config.modules.memory,
91+
(FFModuleBaseInfo*) &instance.config.modules.monitor,
92+
(FFModuleBaseInfo*) &instance.config.modules.mouse,
9393
NULL,
9494
};
9595

9696
static FFModuleBaseInfo* N[] = {
97-
(void*) &instance.config.modules.netIo,
97+
(FFModuleBaseInfo*) &instance.config.modules.netIo,
9898
NULL,
9999
};
100100

101101
static FFModuleBaseInfo* O[] = {
102-
(void*) &instance.config.modules.openCL,
103-
(void*) &instance.config.modules.openGL,
104-
(void*) &instance.config.modules.os,
102+
(FFModuleBaseInfo*) &instance.config.modules.openCL,
103+
(FFModuleBaseInfo*) &instance.config.modules.openGL,
104+
(FFModuleBaseInfo*) &instance.config.modules.os,
105105
NULL,
106106
};
107107

108108
static FFModuleBaseInfo* P[] = {
109-
(void*) &instance.config.modules.packages,
110-
(void*) &instance.config.modules.physicalDisk,
111-
(void*) &instance.config.modules.physicalMemory,
112-
(void*) &instance.config.modules.player,
113-
(void*) &instance.config.modules.powerAdapter,
114-
(void*) &instance.config.modules.processes,
115-
(void*) &instance.config.modules.publicIP,
109+
(FFModuleBaseInfo*) &instance.config.modules.packages,
110+
(FFModuleBaseInfo*) &instance.config.modules.physicalDisk,
111+
(FFModuleBaseInfo*) &instance.config.modules.physicalMemory,
112+
(FFModuleBaseInfo*) &instance.config.modules.player,
113+
(FFModuleBaseInfo*) &instance.config.modules.powerAdapter,
114+
(FFModuleBaseInfo*) &instance.config.modules.processes,
115+
(FFModuleBaseInfo*) &instance.config.modules.publicIP,
116116
NULL,
117117
};
118118

@@ -125,42 +125,42 @@ static FFModuleBaseInfo* R[] = {
125125
};
126126

127127
static FFModuleBaseInfo* S[] = {
128-
(void*) &instance.config.modules.separator,
129-
(void*) &instance.config.modules.shell,
130-
(void*) &instance.config.modules.sound,
131-
(void*) &instance.config.modules.swap,
128+
(FFModuleBaseInfo*) &instance.config.modules.separator,
129+
(FFModuleBaseInfo*) &instance.config.modules.shell,
130+
(FFModuleBaseInfo*) &instance.config.modules.sound,
131+
(FFModuleBaseInfo*) &instance.config.modules.swap,
132132
NULL,
133133
};
134134

135135
static FFModuleBaseInfo* T[] = {
136-
(void*) &instance.config.modules.terminal,
137-
(void*) &instance.config.modules.terminalFont,
138-
(void*) &instance.config.modules.terminalSize,
139-
(void*) &instance.config.modules.terminalTheme,
140-
(void*) &instance.config.modules.title,
141-
(void*) &instance.config.modules.theme,
142-
(void*) &instance.config.modules.tpm,
136+
(FFModuleBaseInfo*) &instance.config.modules.terminal,
137+
(FFModuleBaseInfo*) &instance.config.modules.terminalFont,
138+
(FFModuleBaseInfo*) &instance.config.modules.terminalSize,
139+
(FFModuleBaseInfo*) &instance.config.modules.terminalTheme,
140+
(FFModuleBaseInfo*) &instance.config.modules.title,
141+
(FFModuleBaseInfo*) &instance.config.modules.theme,
142+
(FFModuleBaseInfo*) &instance.config.modules.tpm,
143143
NULL,
144144
};
145145

146146
static FFModuleBaseInfo* U[] = {
147-
(void*) &instance.config.modules.uptime,
148-
(void*) &instance.config.modules.users,
147+
(FFModuleBaseInfo*) &instance.config.modules.uptime,
148+
(FFModuleBaseInfo*) &instance.config.modules.users,
149149
NULL,
150150
};
151151

152152
static FFModuleBaseInfo* V[] = {
153-
(void*) &instance.config.modules.version,
154-
(void*) &instance.config.modules.vulkan,
153+
(FFModuleBaseInfo*) &instance.config.modules.version,
154+
(FFModuleBaseInfo*) &instance.config.modules.vulkan,
155155
NULL,
156156
};
157157

158158
static FFModuleBaseInfo* W[] = {
159-
(void*) &instance.config.modules.wallpaper,
160-
(void*) &instance.config.modules.weather,
161-
(void*) &instance.config.modules.wm,
162-
(void*) &instance.config.modules.wifi,
163-
(void*) &instance.config.modules.wmTheme,
159+
(FFModuleBaseInfo*) &instance.config.modules.wallpaper,
160+
(FFModuleBaseInfo*) &instance.config.modules.weather,
161+
(FFModuleBaseInfo*) &instance.config.modules.wm,
162+
(FFModuleBaseInfo*) &instance.config.modules.wifi,
163+
(FFModuleBaseInfo*) &instance.config.modules.wmTheme,
164164
NULL,
165165
};
166166

@@ -173,7 +173,7 @@ static FFModuleBaseInfo* Y[] = {
173173
};
174174

175175
static FFModuleBaseInfo* Z[] = {
176-
(void*) &instance.config.modules.zpool,
176+
(FFModuleBaseInfo*) &instance.config.modules.zpool,
177177
NULL,
178178
};
179179

‎src/common/parsing.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static void parseSize(FFstrbuf* result, uint64_t bytes, uint32_t base, const cha
7272
}
7373

7474
if(counter == 0)
75-
ffStrbufAppendF(result, "%"PRIu64" %s", bytes, prefixes[0]);
75+
ffStrbufAppendF(result, "%" PRIu64 " %s", bytes, prefixes[0]);
7676
else
7777
ffStrbufAppendF(result, "%.*f %s", instance.config.display.sizeNdigits, size, prefixes[counter]);
7878
}

‎src/detection/bootmgr/bootmgr.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ bool ffEfiFillLoadOption(const FFEfiLoadOption* efiOption, FFBootmgrResult* resu
3434
ffEfiUcs2ToUtf8(efiOption->Description, &result->name);
3535

3636
for (
37-
ffEfiDevicePathProtocol* filePathList = (void*) &efiOption->Description[descLen + 1];
37+
ffEfiDevicePathProtocol* filePathList = (ffEfiDevicePathProtocol*) &efiOption->Description[descLen + 1];
3838
filePathList->Type != 0x7F; // End of Hardware Device Path
39-
filePathList = (void*) ((uint8_t*) filePathList + filePathList->Length))
39+
filePathList = (ffEfiDevicePathProtocol*) ((uint8_t*) filePathList + filePathList->Length))
4040
{
4141
if (filePathList->Type == 4 && filePathList->SubType == 4)
4242
{

‎src/detection/cpuusage/cpuusage.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ const char* ffGetCpuUsageResult(FFCPUUsageOptions* options, FFlist* result)
3636

3737
for (uint32_t i = 0; i < cpuTimes1.length; ++i)
3838
{
39-
FFCpuUsageInfo* cpuTime1 = ffListGet(&cpuTimes1, i);
40-
FFCpuUsageInfo* cpuTime2 = ffListGet(&cpuTimes2, i);
39+
FFCpuUsageInfo* cpuTime1 = FF_LIST_GET(FFCpuUsageInfo, cpuTimes1, i);
40+
FFCpuUsageInfo* cpuTime2 = FF_LIST_GET(FFCpuUsageInfo, cpuTimes2, i);
4141
if (cpuTime2->totalAll <= cpuTime1->totalAll)
4242
{
4343
if (++retryCount <= 3)
@@ -51,8 +51,8 @@ const char* ffGetCpuUsageResult(FFCPUUsageOptions* options, FFlist* result)
5151

5252
for (uint32_t i = 0; i < cpuTimes1.length; ++i)
5353
{
54-
FFCpuUsageInfo* cpuTime1 = ffListGet(&cpuTimes1, i);
55-
FFCpuUsageInfo* cpuTime2 = ffListGet(&cpuTimes2, i);
54+
FFCpuUsageInfo* cpuTime1 = FF_LIST_GET(FFCpuUsageInfo, cpuTimes1, i);
55+
FFCpuUsageInfo* cpuTime2 = FF_LIST_GET(FFCpuUsageInfo, cpuTimes2, i);
5656
*(double*) ffListAdd(result) = (double)(cpuTime2->inUseAll - cpuTime1->inUseAll) / (double)(cpuTime2->totalAll - cpuTime1->totalAll) * 100;
5757
cpuTime1->inUseAll = cpuTime2->inUseAll;
5858
cpuTime1->totalAll = cpuTime2->totalAll;

‎src/detection/disk/disk_linux.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
176176
FF_STRBUF_AUTO_DESTROY zpoolName = ffStrbufCreateNS(index, currentDisk->mountFrom.chars);
177177
for(uint32_t i = 0; i < disks->length - 1; i++)
178178
{
179-
const FFDisk* otherDevice = ffListGet(disks, i);
179+
const FFDisk* otherDevice = FF_LIST_GET(FFDisk, *disks, i);
180180
if(ffStrbufEqualS(&otherDevice->filesystem, "zfs") && ffStrbufStartsWith(&otherDevice->mountFrom, &zpoolName))
181181
return true;
182182
}
@@ -188,7 +188,7 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
188188
//Filter all disks which device was already found. This catches BTRFS subvolumes.
189189
for(uint32_t i = 0; i < disks->length - 1; i++)
190190
{
191-
const FFDisk* otherDevice = ffListGet(disks, i);
191+
const FFDisk* otherDevice = FF_LIST_GET(FFDisk, *disks, i);
192192

193193
if(ffStrbufEqual(&currentDisk->mountFrom, &otherDevice->mountFrom))
194194
return true;

‎src/detection/disk/disk_sunos.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
4848
FF_STRBUF_AUTO_DESTROY zpoolName = ffStrbufCreateNS(index, currentDisk->mountFrom.chars);
4949
for(uint32_t i = 0; i < disks->length - 1; i++)
5050
{
51-
const FFDisk* otherDevice = ffListGet(disks, i);
51+
const FFDisk* otherDevice = FF_LIST_GET(FFDisk, *disks, i);
5252
if(ffStrbufEqualS(&otherDevice->filesystem, "zfs") && ffStrbufStartsWith(&otherDevice->mountFrom, &zpoolName))
5353
return true;
5454
}
@@ -60,7 +60,7 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
6060
//Filter all disks which device was already found. This catches BTRFS subvolumes.
6161
for(uint32_t i = 0; i < disks->length - 1; i++)
6262
{
63-
const FFDisk* otherDevice = ffListGet(disks, i);
63+
const FFDisk* otherDevice = FF_LIST_GET(FFDisk, *disks, i);
6464

6565
if(ffStrbufEqual(&currentDisk->mountFrom, &otherDevice->mountFrom))
6666
return true;

‎src/detection/diskio/diskio.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ const char* ffDetectDiskIO(FFlist* result, FFDiskIOOptions* options)
5656

5757
for (uint32_t i = 0; i < result->length; ++i)
5858
{
59-
FFDiskIOResult* icPrev = (FFDiskIOResult*)ffListGet(&ioCounters1, i);
60-
FFDiskIOResult* icCurr = (FFDiskIOResult*)ffListGet(result, i);
59+
FFDiskIOResult* icPrev = FF_LIST_GET(FFDiskIOResult, ioCounters1, i);
60+
FFDiskIOResult* icCurr = FF_LIST_GET(FFDiskIOResult, *result, i);
6161
if (!ffStrbufEqual(&icPrev->devPath, &icCurr->devPath))
6262
return "Physical disk device path changed";
6363

‎src/detection/displayserver/displayserver.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FFDisplayResult* ffdsAppendDisplay(
1919
if(width == 0 || height == 0)
2020
return NULL;
2121

22-
FFDisplayResult* display = ffListAdd(&result->displays);
22+
FFDisplayResult* display = (FFDisplayResult*) ffListAdd(&result->displays);
2323
display->width = width;
2424
display->height = height;
2525
display->refreshRate = refreshRate;

0 commit comments

Comments
 (0)