fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-28 15:53:51 +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/diskio/diskio.c
+53 -69
View File
@@ -7,36 +7,29 @@
#define FF_DISKIO_DISPLAY_NAME "Disk IO"
static int sortDevices(const FFDiskIOResult* left, const FFDiskIOResult* right)
{
static int sortDevices(const FFDiskIOResult* left, const FFDiskIOResult* right) {
return ffStrbufComp(&left->name, &right->name);
}
static void formatKey(const FFDiskIOOptions* options, FFDiskIOResult* dev, uint32_t index, FFstrbuf* key)
{
if(options->moduleArgs.key.length == 0)
{
static void formatKey(const FFDiskIOOptions* options, FFDiskIOResult* dev, uint32_t index, FFstrbuf* key) {
if (options->moduleArgs.key.length == 0) {
ffStrbufSetF(key, FF_DISKIO_DISPLAY_NAME " (%s)", dev->name.length ? dev->name.chars : dev->devPath.chars);
}
else
{
} else {
ffStrbufClear(key);
FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, ((FFformatarg[]){
FF_ARG(index, "index"),
FF_ARG(dev->name, "name"),
FF_ARG(dev->devPath, "dev-path"),
FF_ARG(options->moduleArgs.keyIcon, "icon"),
}));
FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, ((FFformatarg[]) {
FF_ARG(index, "index"),
FF_ARG(dev->name, "name"),
FF_ARG(dev->devPath, "dev-path"),
FF_ARG(options->moduleArgs.keyIcon, "icon"),
}));
}
}
bool ffPrintDiskIO(FFDiskIOOptions* options)
{
bool ffPrintDiskIO(FFDiskIOOptions* options) {
FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFDiskIOResult));
const char* error = ffDetectDiskIO(&result, options);
if(error)
{
if (error) {
ffPrintError(FF_DISKIO_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, "%s", error);
return false;
}
@@ -48,48 +41,51 @@ bool ffPrintDiskIO(FFDiskIOOptions* options)
FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
FF_STRBUF_AUTO_DESTROY buffer2 = ffStrbufCreate();
FF_LIST_FOR_EACH(FFDiskIOResult, dev, result)
{
FF_LIST_FOR_EACH (FFDiskIOResult, dev, result) {
formatKey(options, dev, result.length == 1 ? 0 : index + 1, &key);
ffStrbufClear(&buffer);
if(options->moduleArgs.outputFormat.length == 0)
{
if (options->moduleArgs.outputFormat.length == 0) {
ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
ffSizeAppendNum(dev->bytesRead, &buffer);
if (!options->detectTotal) ffStrbufAppendS(&buffer, "/s");
if (!options->detectTotal) {
ffStrbufAppendS(&buffer, "/s");
}
ffStrbufAppendS(&buffer, " (R) - ");
ffSizeAppendNum(dev->bytesWritten, &buffer);
if (!options->detectTotal) ffStrbufAppendS(&buffer, "/s");
if (!options->detectTotal) {
ffStrbufAppendS(&buffer, "/s");
}
ffStrbufAppendS(&buffer, " (W)");
ffStrbufPutTo(&buffer, stdout);
}
else
{
} else {
ffSizeAppendNum(dev->bytesRead, &buffer);
if (!options->detectTotal) ffStrbufAppendS(&buffer, "/s");
if (!options->detectTotal) {
ffStrbufAppendS(&buffer, "/s");
}
ffStrbufClear(&buffer2);
ffSizeAppendNum(dev->bytesWritten, &buffer2);
if (!options->detectTotal) ffStrbufAppendS(&buffer2, "/s");
if (!options->detectTotal) {
ffStrbufAppendS(&buffer2, "/s");
}
FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]){
FF_ARG(buffer, "size-read"),
FF_ARG(buffer2, "size-written"),
FF_ARG(dev->name, "name"),
FF_ARG(dev->devPath, "dev-path"),
FF_ARG(dev->bytesRead, "bytes-read"),
FF_ARG(dev->bytesWritten, "bytes-written"),
FF_ARG(dev->readCount, "read-count"),
FF_ARG(dev->writeCount, "write-count"),
}));
FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
FF_ARG(buffer, "size-read"),
FF_ARG(buffer2, "size-written"),
FF_ARG(dev->name, "name"),
FF_ARG(dev->devPath, "dev-path"),
FF_ARG(dev->bytesRead, "bytes-read"),
FF_ARG(dev->bytesWritten, "bytes-written"),
FF_ARG(dev->readCount, "read-count"),
FF_ARG(dev->writeCount, "write-count"),
}));
}
++index;
}
FF_LIST_FOR_EACH(FFDiskIOResult, dev, result)
{
FF_LIST_FOR_EACH (FFDiskIOResult, dev, result) {
ffStrbufDestroy(&dev->name);
ffStrbufDestroy(&dev->devPath);
}
@@ -97,29 +93,25 @@ bool ffPrintDiskIO(FFDiskIOOptions* options)
return true;
}
void ffParseDiskIOJsonObject(FFDiskIOOptions* options, yyjson_val* module)
{
void ffParseDiskIOJsonObject(FFDiskIOOptions* 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, "namePrefix"))
{
if (unsafe_yyjson_equals_str(key, "namePrefix")) {
ffStrbufSetJsonVal(&options->namePrefix, val);
continue;
}
if (unsafe_yyjson_equals_str(key, "detectTotal"))
{
if (unsafe_yyjson_equals_str(key, "detectTotal")) {
options->detectTotal = yyjson_get_bool(val);
continue;
}
if (unsafe_yyjson_equals_str(key, "waitTime"))
{
if (unsafe_yyjson_equals_str(key, "waitTime")) {
options->waitTime = (uint32_t) yyjson_get_uint(val);
continue;
}
@@ -128,8 +120,7 @@ void ffParseDiskIOJsonObject(FFDiskIOOptions* options, yyjson_val* module)
}
}
void ffGenerateDiskIOJsonConfig(FFDiskIOOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
{
void ffGenerateDiskIOJsonConfig(FFDiskIOOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) {
ffJsonConfigGenerateModuleArgsConfig(doc, module, &options->moduleArgs);
yyjson_mut_obj_add_strbuf(doc, module, "namePrefix", &options->namePrefix);
@@ -139,20 +130,17 @@ void ffGenerateDiskIOJsonConfig(FFDiskIOOptions* options, yyjson_mut_doc* doc, y
yyjson_mut_obj_add_uint(doc, module, "waitTime", options->waitTime);
}
bool ffGenerateDiskIOJsonResult(FFDiskIOOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
{
bool ffGenerateDiskIOJsonResult(FFDiskIOOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) {
FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFDiskIOResult));
const char* error = ffDetectDiskIO(&result, options);
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");
FF_LIST_FOR_EACH(FFDiskIOResult, dev, result)
{
FF_LIST_FOR_EACH (FFDiskIOResult, dev, result) {
yyjson_mut_val* obj = yyjson_mut_arr_add_obj(doc, arr);
yyjson_mut_obj_add_strbuf(doc, obj, "name", &dev->name);
yyjson_mut_obj_add_strbuf(doc, obj, "devPath", &dev->devPath);
@@ -162,8 +150,7 @@ bool ffGenerateDiskIOJsonResult(FFDiskIOOptions* options, yyjson_mut_doc* doc, y
yyjson_mut_obj_add_uint(doc, obj, "writeCount", dev->writeCount);
}
FF_LIST_FOR_EACH(FFDiskIOResult, dev, result)
{
FF_LIST_FOR_EACH (FFDiskIOResult, dev, result) {
ffStrbufDestroy(&dev->name);
ffStrbufDestroy(&dev->devPath);
}
@@ -171,8 +158,7 @@ bool ffGenerateDiskIOJsonResult(FFDiskIOOptions* options, yyjson_mut_doc* doc, y
return true;
}
void ffInitDiskIOOptions(FFDiskIOOptions* options)
{
void ffInitDiskIOOptions(FFDiskIOOptions* options) {
ffOptionInitModuleArg(&options->moduleArgs, "󰓅");
ffStrbufInit(&options->namePrefix);
@@ -180,8 +166,7 @@ void ffInitDiskIOOptions(FFDiskIOOptions* options)
options->waitTime = 1000;
}
void ffDestroyDiskIOOptions(FFDiskIOOptions* options)
{
void ffDestroyDiskIOOptions(FFDiskIOOptions* options) {
ffOptionDestroyModuleArg(&options->moduleArgs);
ffStrbufDestroy(&options->namePrefix);
}
@@ -204,5 +189,4 @@ FFModuleBaseInfo ffDiskIOModuleInfo = {
{"Size of data written [per second] (in bytes)", "bytes-written"},
{"Number of reads", "read-count"},
{"Number of writes", "write-count"},
}))
};
}))};
src/modules/diskio/option.h
+1 -2
View File
@@ -2,8 +2,7 @@
#include "common/option.h"
typedef struct FFDiskIOOptions
{
typedef struct FFDiskIOOptions {
FFModuleArgs moduleArgs;
FFstrbuf namePrefix;