fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-30 09:33:39 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

FFstrbuf: remove ffStrbufRemoveStringsV; rename ffStrbufRemoveStringsA to ffStrbufRemoveStrings

Browse Source
This commit is contained in:
李通洲
2023-07-25 14:53:57 +08:00
committed by 李通洲
parent 62cfd27ac0
commit e685a00a4b
8 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/cpu/cpu.c
+1 -1
View File
@@ -14,7 +14,7 @@ const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu)
" 2-Core", " 4-Core", " 6-Core", " 8-Core", " 10-Core", " 12-Core", " 14-Core", " 16-Core",
" with Radeon Graphics"
};
ffStrbufRemoveStringsA(&cpu->name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
ffStrbufRemoveStrings(&cpu->name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
ffStrbufSubstrBeforeFirstC(&cpu->name, '@'); //Cut the speed output in the name as we append our own
ffStrbufTrimRight(&cpu->name, ' '); //If we removed the @ in previous step there was most likely a space before it
return NULL;
src/detection/gpu/gpu_linux.c
+1 -1
View File
@@ -80,7 +80,7 @@ static void drmDetectDeviceName(FFGPUResult* gpu, PCIData* pci, struct pci_dev*
" (TM)", "(TM)",
" Graphics Adapter", " Graphics", " Series", " Edition"
};
ffStrbufRemoveStringsA(&gpu->name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
ffStrbufRemoveStrings(&gpu->name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
}
static void pciDetectDeviceName(FFGPUResult* gpu, PCIData* pci, struct pci_dev* device)
src/detection/terminalshell/terminalshell_linux.c
+1 -1
View File
@@ -299,7 +299,7 @@ static void getShellVersionGeneric(FFstrbuf* exe, const char* exeName, FFstrbuf*
NULL
});
ffStrbufSubstrBeforeFirstC(version, '(');
ffStrbufRemoveStrings(version, 2, "-release", "release");
ffStrbufRemoveStrings(version, 2, (const char*[]) { "-release", "release" });
}
bool fftsGetShellVersion(FFstrbuf* exe, const char* exeName, FFstrbuf* version);
src/detection/wmtheme/wmtheme_linux.c
+1 -1
View File
@@ -164,7 +164,7 @@ static bool detectOpenbox(const FFstrbuf* dePrettyName, FFstrbuf* themeOrError)
if(strstr(line, "<name>") != 0)
{
ffStrbufAppendS(themeOrError, line);
ffStrbufRemoveStrings(themeOrError, 2, "<name>", "</name>");
ffStrbufRemoveStrings(themeOrError, 2, (const char*[]) { "<name>", "</name>" });
ffStrbufTrimRight(themeOrError, '\n');
ffStrbufTrim(themeOrError, ' ');
break;