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

Chore: run clang-format

Browse Source 
```bash
find . -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" \) ! -path "src/3rdparty/*" -print0 | xargs -0 clang-format -i
```
This commit is contained in:
李通洲
2026-03-29 09:28:49 +08:00
parent cdd4cee968
commit e0eba8ce21
690 changed files with 28093 additions and 30062 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/loadavg/loadavg.c
+47 -64
View File
@@ -6,26 +6,20 @@
#include "detection/cpu/cpu.h"
#include "modules/loadavg/loadavg.h"
bool ffPrintLoadavg(FFLoadavgOptions* options)
{
double result[3] = { 0.0 / 0.0, 0.0 / 0.0, 0.0 / 0.0 };
bool ffPrintLoadavg(FFLoadavgOptions* options) {
double result[3] = {0.0 / 0.0, 0.0 / 0.0, 0.0 / 0.0};
const char* error = ffDetectLoadavg(result);
if(error)
{
if (error) {
ffPrintError(FF_LOADAVG_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
return false;
}
if(options->moduleArgs.outputFormat.length == 0)
{
if (options->compact)
{
if (options->moduleArgs.outputFormat.length == 0) {
if (options->compact) {
ffPrintLogoAndKey(FF_LOADAVG_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
printf("%.*f, %.*f, %.*f\n", options->ndigits, result[0], options->ndigits, result[1], options->ndigits, result[2]);
}
else
{
} else {
FFCPUResult cpu = {
.temperature = FF_CPU_TEMP_UNSET,
.frequencyMax = 0,
@@ -36,21 +30,18 @@ bool ffPrintLoadavg(FFLoadavgOptions* options)
ffDetectCPU(&(FFCPUOptions) {}, &cpu);
FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
for (uint32_t index = 0; index < 3; index++)
{
uint32_t duration = index == 0 ? 1 : index == 1 ? 5 : 15;
if (options->moduleArgs.key.length == 0)
{
for (uint32_t index = 0; index < 3; index++) {
uint32_t duration = index == 0 ? 1 : index == 1 ? 5
: 15;
if (options->moduleArgs.key.length == 0) {
ffStrbufSetF(&buffer, "%s (%d min)", FF_LOADAVG_MODULE_NAME, duration);
}
else
{
} else {
ffStrbufClear(&buffer);
FF_PARSE_FORMAT_STRING_CHECKED(&buffer, &options->moduleArgs.key, ((FFformatarg[]) {
FF_ARG(index, "index"),
FF_ARG(duration, "duration"),
FF_ARG(options->moduleArgs.keyIcon, "icon"),
}));
FF_ARG(index, "index"),
FF_ARG(duration, "duration"),
FF_ARG(options->moduleArgs.keyIcon, "icon"),
}));
}
ffPrintLogoAndKey(buffer.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
@@ -59,69 +50,65 @@ bool ffPrintLoadavg(FFLoadavgOptions* options)
double percent = result[index] * 100 / cpu.coresOnline;
FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
if (percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
if (percentType & FF_PERCENTAGE_TYPE_BAR_BIT) {
ffPercentAppendBar(&buffer, percent, options->percent, &options->moduleArgs);
}
if (!(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
{
if (buffer.length > 0)
if (!(percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT)) {
if (buffer.length > 0) {
ffStrbufAppendC(&buffer, ' ');
}
ffStrbufAppendF(&buffer, "%.*f", options->ndigits, result[index]);
}
if (percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
{
if (buffer.length > 0)
if (percentType & FF_PERCENTAGE_TYPE_NUM_BIT) {
if (buffer.length > 0) {
ffStrbufAppendC(&buffer, ' ');
}
ffPercentAppendNum(&buffer, percent, options->percent, buffer.length > 0, &options->moduleArgs);
}
ffStrbufPutTo(&buffer, stdout);
}
}
}
else
{
FF_PRINT_FORMAT_CHECKED(FF_LOADAVG_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]){
FF_ARG(result[0], "loadavg1"),
FF_ARG(result[1], "loadavg2"),
FF_ARG(result[2], "loadavg3"),
}));
} else {
FF_PRINT_FORMAT_CHECKED(FF_LOADAVG_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
FF_ARG(result[0], "loadavg1"),
FF_ARG(result[1], "loadavg2"),
FF_ARG(result[2], "loadavg3"),
}));
}
return true;
}
void ffParseLoadavgJsonObject(FFLoadavgOptions* options, yyjson_val* module)
{
void ffParseLoadavgJsonObject(FFLoadavgOptions* options, yyjson_val* module) {
yyjson_val *key, *val;
size_t idx, max;
yyjson_obj_foreach(module, idx, max, key, val)
{
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
yyjson_obj_foreach (module, idx, max, key, val) {
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) {
continue;
}
if (unsafe_yyjson_equals_str(key, "ndigits"))
{
if (unsafe_yyjson_equals_str(key, "ndigits")) {
options->ndigits = (uint8_t) yyjson_get_uint(val);
continue;
}
if (unsafe_yyjson_equals_str(key, "compact"))
{
if (unsafe_yyjson_equals_str(key, "compact")) {
options->compact = yyjson_get_bool(val);
continue;
}
if (ffPercentParseJsonObject(key, val, &options->percent))
if (ffPercentParseJsonObject(key, val, &options->percent)) {
continue;
}
ffPrintError(FF_LOADAVG_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
}
}
void ffGenerateLoadavgJsonConfig(FFLoadavgOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
{
void ffGenerateLoadavgJsonConfig(FFLoadavgOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) {
ffJsonConfigGenerateModuleArgsConfig(doc, module, &options->moduleArgs);
yyjson_mut_obj_add_uint(doc, module, "ndigits", options->ndigits);
@@ -131,35 +118,32 @@ void ffGenerateLoadavgJsonConfig(FFLoadavgOptions* options, yyjson_mut_doc* doc,
ffPercentGenerateJsonConfig(doc, module, options->percent);
}
bool ffGenerateLoadavgJsonResult(FF_MAYBE_UNUSED FFLoadavgOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
{
double result[3] = { 0.0 / 0.0, 0.0 / 0.0, 0.0 / 0.0 };
bool ffGenerateLoadavgJsonResult(FF_MAYBE_UNUSED FFLoadavgOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) {
double result[3] = {0.0 / 0.0, 0.0 / 0.0, 0.0 / 0.0};
const char* error = ffDetectLoadavg(result);
if(error)
{
if (error) {
yyjson_mut_obj_add_str(doc, module, "error", error);
return false;
}
yyjson_mut_val* arr = yyjson_mut_obj_add_arr(doc, module, "result");
for (size_t i = 0; i < 3; i++)
for (size_t i = 0; i < 3; i++) {
yyjson_mut_arr_add_real(doc, arr, result[i]);
}
return true;
}
void ffInitLoadavgOptions(FFLoadavgOptions* options)
{
void ffInitLoadavgOptions(FFLoadavgOptions* options) {
ffOptionInitModuleArg(&options->moduleArgs, "");
options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };
options->percent = (FFPercentageModuleConfig) {50, 80, 0};
options->ndigits = 2;
options->compact = true;
}
void ffDestroyLoadavgOptions(FFLoadavgOptions* options)
{
void ffDestroyLoadavgOptions(FFLoadavgOptions* options) {
ffOptionDestroyModuleArg(&options->moduleArgs);
}
@@ -176,5 +160,4 @@ FFModuleBaseInfo ffLoadavgModuleInfo = {
{"Load average over 1min", "loadavg1"},
{"Load average over 5min", "loadavg2"},
{"Load average over 15min", "loadavg3"},
}))
};
}))};
src/modules/loadavg/option.h
+1 -2
View File
@@ -2,8 +2,7 @@
#include "common/option.h"
typedef struct FFLoadavgOptions
{
typedef struct FFLoadavgOptions {
FFModuleArgs moduleArgs;
FFPercentageModuleConfig percent;