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

Global: replaces NULL to nullptr

Browse Source
This commit is contained in:
李通洲
2026-07-10 18:08:04 +08:00
parent 873454191f
commit ba18705d2e
387 changed files with 2411 additions and 2411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/bluetoothradio/bluetoothradio.c
+1 -1
View File
@@ -27,7 +27,7 @@ static void printDevice(FFBluetoothRadioOptions* options, const FFBluetoothRadio
}));
}
const char* version = NULL;
const char* version = nullptr;
switch (radio->lmpVersion < 0 ? -radio->lmpVersion : radio->lmpVersion) {
case 0:
src/modules/break/break.c
+1 -1
View File
@@ -16,7 +16,7 @@ void ffParseBreakJsonObject(FF_A_UNUSED FFBreakOptions* options, FF_A_UNUSED yyj
continue;
}
ffPrintError(FF_BREAK_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
ffPrintError(FF_BREAK_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
}
}
src/modules/codec/codec.c
+1 -1
View File
@@ -174,7 +174,7 @@ void ffParseCodecJsonObject(FFCodecOptions* options, yyjson_val* module) {
{},
});
if (error) {
ffPrintError(FF_CODEC_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
ffPrintError(FF_CODEC_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
} else {
options->showType = (FFCodecShowType) value;
}
src/modules/colors/colors.c
+7 -7
View File
@@ -164,7 +164,7 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) {
{},
});
if (error) {
ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
} else {
options->symbol = (FFColorsSymbol) value;
}
@@ -178,7 +178,7 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) {
if (unsafe_yyjson_equals_str(key, "block")) {
if (!yyjson_is_obj(val)) {
ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: must be an object", unsafe_yyjson_get_str(key));
ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: must be an object", unsafe_yyjson_get_str(key));
} else {
yyjson_val* width = yyjson_obj_get(val, "width");
if (width) {
@@ -188,14 +188,14 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) {
yyjson_val* range = yyjson_obj_get(val, "range");
if (range) {
if (!yyjson_is_arr(range) || yyjson_arr_size(range) != 2) {
ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: must be an array of 2 elements", unsafe_yyjson_get_str(key));
ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: must be an array of 2 elements", unsafe_yyjson_get_str(key));
} else {
uint8_t start = (uint8_t) yyjson_get_uint(yyjson_arr_get(range, 0));
uint8_t end = (uint8_t) yyjson_get_uint(yyjson_arr_get(range, 1));
if (start > end) {
ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[0] > range[1]", unsafe_yyjson_get_str(key));
ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[0] > range[1]", unsafe_yyjson_get_str(key));
} else if (end > 15) {
ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[1] > 15", unsafe_yyjson_get_str(key));
ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[1] > 15", unsafe_yyjson_get_str(key));
} else {
options->block.range[0] = start;
options->block.range[1] = end;
@@ -215,14 +215,14 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) {
{},
});
if (error) {
ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
} else {
options->brightness = (FFColorsBrightness) value;
}
continue;
}
ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
}
}
src/modules/command/command.c
+2 -2
View File
@@ -19,7 +19,7 @@ bool ffPrintCommand(FFCommandOptions* options) {
if (options->splitLines) {
uint8_t index = 0;
char* line = NULL;
char* line = nullptr;
size_t len = 0;
while (ffStrbufGetline(&line, &len, &result)) {
if (options->moduleArgs.outputFormat.length == 0) {
@@ -110,7 +110,7 @@ bool ffGenerateCommandJsonResult(FF_A_UNUSED FFCommandOptions* options, yyjson_m
if (options->splitLines) {
yyjson_mut_val* jsonArray = yyjson_mut_obj_add_arr(doc, module, "result");
char* line = NULL;
char* line = nullptr;
size_t len = 0;
while (ffStrbufGetline(&line, &len, &result)) {
yyjson_mut_arr_add_strncpy(doc, jsonArray, line, len);
src/modules/disk/disk.c
+1 -1
View File
@@ -21,7 +21,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index
FF_STRBUF_AUTO_DESTROY mountpointLink = ffStrbufCreate();
FF_STRBUF_AUTO_DESTROY nameLink = ffStrbufCreate();
#ifdef __linux__
if (getenv("WSL_DISTRO_NAME") != NULL && getenv("WT_SESSION") != NULL) {
if (getenv("WSL_DISTRO_NAME") != nullptr && getenv("WT_SESSION") != nullptr) {
if (ffStrbufEqualS(&disk->filesystem, "9p") && ffStrbufStartsWithS(&disk->mountpoint, "/mnt/")) {
ffStrbufSetF(&mountpointLink, "\e]8;;file:///%c:/\e\\%s\e]8;;\e\\", disk->mountpoint.chars[5], disk->mountpoint.chars);
ffStrbufSetF(&nameLink, "\e]8;;file:///%c:/\e\\%s\e]8;;\e\\", disk->mountpoint.chars[5], disk->name.chars);
src/modules/display/display.c
+1 -1
View File
@@ -65,7 +65,7 @@ bool ffPrintDisplay(FFDisplayOptions* options) {
for (uint32_t i = 0; i < dsResult->displays.length; i++) {
FFDisplayResult* result = FF_LIST_GET(FFDisplayResult, dsResult->displays, i);
uint32_t moduleIndex = dsResult->displays.length == 1 ? 0 : i + 1;
const char* displayType = result->type == FF_DISPLAY_TYPE_UNKNOWN ? NULL : result->type == FF_DISPLAY_TYPE_BUILTIN ? "Built-in"
const char* displayType = result->type == FF_DISPLAY_TYPE_UNKNOWN ? nullptr : result->type == FF_DISPLAY_TYPE_BUILTIN ? "Built-in"
: "External";
ffStrbufClear(&key);
src/modules/dns/dns.c
+1 -1
View File
@@ -73,7 +73,7 @@ void ffParseDNSJsonObject(FFDNSOptions* options, yyjson_val* module) {
{},
});
if (error) {
ffPrintError(FF_DNS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
ffPrintError(FF_DNS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
} else {
options->showType = (FFDNSShowType) value;
}
src/modules/gpu/gpu.c
+1 -1
View File
@@ -412,7 +412,7 @@ bool ffGenerateGPUJsonResult(FFGPUOptions* options, yyjson_mut_doc* doc, yyjson_
type = "Discrete";
break;
default:
type = NULL;
type = nullptr;
break;
}
if (type) {
src/modules/localip/localip.c
+1 -1
View File
@@ -308,7 +308,7 @@ void ffGenerateLocalIpJsonConfig(FFLocalIpOptions* options, yyjson_mut_doc* doc,
if (options->ipv6Type == FF_LOCALIP_IPV6_TYPE_AUTO) {
yyjson_mut_obj_add_bool(doc, module, "showIpv6", !!(options->showType & FF_LOCALIP_TYPE_IPV6_BIT));
} else {
const char* str = NULL;
const char* str = nullptr;
switch (options->ipv6Type) {
case FF_LOCALIP_IPV6_TYPE_GUA_BIT:
str = "gua";
src/modules/logo/logo.c
+2 -2
View File
@@ -4,7 +4,7 @@
#include "options/logo.h"
bool ffPrintLogo(FF_A_UNUSED FFLogoOptions* options) {
ffPrintError(FF_LOGO_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_DEFAULT, "Supported in JSON format only");
ffPrintError(FF_LOGO_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_DEFAULT, "Supported in JSON format only");
return false;
}
@@ -16,7 +16,7 @@ void ffParseLogoJsonObject(FF_A_UNUSED FFLogoOptions* options, FF_A_UNUSED yyjso
continue;
}
ffPrintError(FF_LOGO_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
ffPrintError(FF_LOGO_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
}
}
src/modules/modules.c
+26 -26
View File
@@ -6,7 +6,7 @@
// We rely `LTO` to remove the unused code (only enabled in Release mode)
static FFModuleBaseInfo* A[] = {
NULL,
nullptr,
};
static FFModuleBaseInfo* B[] = {
@@ -37,7 +37,7 @@ static FFModuleBaseInfo* B[] = {
#if !FF_MODULE_DISABLE_BTRFS
&ffBtrfsModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* C[] = {
@@ -71,7 +71,7 @@ static FFModuleBaseInfo* C[] = {
#if !FF_MODULE_DISABLE_CUSTOM
&ffCustomModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* D[] = {
@@ -93,21 +93,21 @@ static FFModuleBaseInfo* D[] = {
#if !FF_MODULE_DISABLE_DNS
&ffDNSModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* E[] = {
#if !FF_MODULE_DISABLE_EDITOR
&ffEditorModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* F[] = {
#if !FF_MODULE_DISABLE_FONT
&ffFontModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* G[] = {
@@ -117,14 +117,14 @@ static FFModuleBaseInfo* G[] = {
#if !FF_MODULE_DISABLE_GPU
&ffGPUModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* H[] = {
#if !FF_MODULE_DISABLE_HOST
&ffHostModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* I[] = {
@@ -134,11 +134,11 @@ static FFModuleBaseInfo* I[] = {
#if !FF_MODULE_DISABLE_INITSYSTEM
&ffInitSystemModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* J[] = {
NULL,
nullptr,
};
static FFModuleBaseInfo* K[] = {
@@ -148,7 +148,7 @@ static FFModuleBaseInfo* K[] = {
#if !FF_MODULE_DISABLE_KEYBOARD
&ffKeyboardModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* L[] = {
@@ -167,7 +167,7 @@ static FFModuleBaseInfo* L[] = {
#if !FF_MODULE_DISABLE_LOGO
&ffLogoModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* M[] = {
@@ -183,14 +183,14 @@ static FFModuleBaseInfo* M[] = {
#if !FF_MODULE_DISABLE_MOUSE
&ffMouseModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* N[] = {
#if !FF_MODULE_DISABLE_NETIO
&ffNetIOModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* O[] = {
@@ -203,7 +203,7 @@ static FFModuleBaseInfo* O[] = {
#if !FF_MODULE_DISABLE_OS
&ffOSModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* P[] = {
@@ -228,15 +228,15 @@ static FFModuleBaseInfo* P[] = {
#if !FF_MODULE_DISABLE_PUBLICIP
&ffPublicIPModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* Q[] = {
NULL,
nullptr,
};
static FFModuleBaseInfo* R[] = {
NULL,
nullptr,
};
static FFModuleBaseInfo* S[] = {
@@ -252,7 +252,7 @@ static FFModuleBaseInfo* S[] = {
#if !FF_MODULE_DISABLE_SWAP
&ffSwapModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* T[] = {
@@ -277,7 +277,7 @@ static FFModuleBaseInfo* T[] = {
#if !FF_MODULE_DISABLE_TPM
&ffTPMModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* U[] = {
@@ -287,7 +287,7 @@ static FFModuleBaseInfo* U[] = {
#if !FF_MODULE_DISABLE_USERS
&ffUsersModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* V[] = {
@@ -297,7 +297,7 @@ static FFModuleBaseInfo* V[] = {
#if !FF_MODULE_DISABLE_VULKAN
&ffVulkanModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* W[] = {
@@ -316,22 +316,22 @@ static FFModuleBaseInfo* W[] = {
#if !FF_MODULE_DISABLE_WMTHEME
&ffWMThemeModuleInfo,
#endif
NULL,
nullptr,
};
static FFModuleBaseInfo* X[] = {
NULL,
nullptr,
};
static FFModuleBaseInfo* Y[] = {
NULL,
nullptr,
};
static FFModuleBaseInfo* Z[] = {
#if !FF_MODULE_DISABLE_ZPOOL
&ffZpoolModuleInfo,
#endif
NULL,
nullptr,
};
FFModuleBaseInfo** ffModuleInfos[] = {
src/modules/opencl/opencl.c
+2 -2
View File
@@ -8,7 +8,7 @@
bool ffPrintOpenCL(FFOpenCLOptions* options) {
FFOpenCLResult* result = ffDetectOpenCL();
if (result->error != NULL) {
if (result->error != nullptr) {
ffPrintError(FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", result->error);
return false;
}
@@ -46,7 +46,7 @@ void ffGenerateOpenCLJsonConfig(FFOpenCLOptions* options, yyjson_mut_doc* doc, y
bool ffGenerateOpenCLJsonResult(FF_A_UNUSED FFOpenCLOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) {
FFOpenCLResult* result = ffDetectOpenCL();
if (result->error != NULL) {
if (result->error != nullptr) {
yyjson_mut_obj_add_str(doc, module, "error", result->error);
return false;
}
src/modules/opengl/opengl.c
+1 -1
View File
@@ -95,7 +95,7 @@ bool ffGenerateOpenGLJsonResult(FF_A_UNUSED FFOpenGLOptions* options, yyjson_mut
ffStrbufInit(&result.library);
const char* error = ffDetectOpenGL(options, &result);
if (error != NULL) {
if (error != nullptr) {
yyjson_mut_obj_add_str(doc, module, "error", error);
} else {
yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result");
src/modules/separator/separator.c
+2 -2
View File
@@ -95,11 +95,11 @@ void ffParseSeparatorJsonObject(FFSeparatorOptions* options, yyjson_val* module)
}
if (unsafe_yyjson_equals_str(key, "length")) {
ffPrintError(FF_SEPARATOR_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "The option length has been renamed to times.");
ffPrintError(FF_SEPARATOR_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "The option length has been renamed to times.");
continue;
}
ffPrintError(FF_SEPARATOR_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
ffPrintError(FF_SEPARATOR_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
}
}
src/modules/title/title.c
+1 -1
View File
@@ -124,7 +124,7 @@ void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module) {
continue;
}
ffPrintError(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
ffPrintError(FF_TITLE_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
}
}