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

Android: simplify code; fix mistakes in terminal font detection code

Browse Source
This commit is contained in:
李通洲
2022-11-17 20:19:27 +08:00
parent e8e586ce7c
commit fde9379bb2
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/os/os_android.c
+8 -13
View File
@@ -5,14 +5,11 @@ void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance)
{ {
FF_UNUSED(instance); FF_UNUSED(instance);
ffStrbufInit(&os->name); ffStrbufInitS(&os->name, "Android");
ffStrbufSetS(&os->name, "Android");
ffStrbufInit(&os->prettyName); ffStrbufInitS(&os->prettyName, "Android");
ffStrbufSetS(&os->prettyName, "Android");
ffStrbufInit(&os->id); ffStrbufInitS(&os->id, "android");
ffStrbufSetS(&os->id, "android");
ffStrbufInit(&os->version); ffStrbufInit(&os->version);
ffSettingsGetAndroidProperty("ro.build.version.release", &os->version); ffSettingsGetAndroidProperty("ro.build.version.release", &os->version);
@@ -26,13 +23,11 @@ void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance)
ffStrbufInit(&os->buildID); ffStrbufInit(&os->buildID);
ffSettingsGetAndroidProperty("ro.build.id", &os->buildID); ffSettingsGetAndroidProperty("ro.build.id", &os->buildID);
ffStrbufInit(&os->systemName); ffStrbufInitS(&os->systemName, instance->state.utsname.sysname);
ffStrbufSetS(&os->systemName, instance->state.utsname.sysname);
ffStrbufInit(&os->architecture); ffStrbufInitS(&os->architecture, instance->state.utsname.machine);
ffStrbufSetS(&os->architecture, instance->state.utsname.machine);
ffStrbufInitA(&os->idLike, 0); ffStrbufInit(&os->idLike);
ffStrbufInitA(&os->variant, 0); ffStrbufInit(&os->variant);
ffStrbufInitA(&os->variantID, 0); ffStrbufInit(&os->variantID);
} }
src/detection/terminalfont/terminalfont_android.c
+2 -2
View File
@@ -31,7 +31,7 @@ const char* detectTermux(const FFinstance* instance, FFTerminalFontResult* termi
goto exit; goto exit;
} }
if(ffFT_New_Face(library, FF_TERMUX_FONT_PATH, 0, &face )) if(ffFT_New_Face(library, FF_TERMUX_FONT_PATH, 0, &face))
{ {
error = "FT_NEW_Face(" FF_TERMUX_FONT_PATH ") failed"; error = "FT_NEW_Face(" FF_TERMUX_FONT_PATH ") failed";
goto exit; goto exit;
@@ -49,7 +49,7 @@ exit:
#else #else
FF_UNUSED(terminalFont); FF_UNUSED(terminalFont);
ffStrbufSetS(&terminalFont->error, "fastfetch is built without freetype2 support"); return "fastfetch is built without freetype2 support";
#endif #endif
} }