From fde9379bb285a6d6894deabb37c47a12f428835c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 17 Nov 2022 20:19:27 +0800 Subject: [PATCH] Android: simplify code; fix mistakes in terminal font detection code --- src/detection/os/os_android.c | 21 +++++++------------ .../terminalfont/terminalfont_android.c | 4 ++-- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/detection/os/os_android.c b/src/detection/os/os_android.c index bb3b6c9da..eb4bf97d5 100644 --- a/src/detection/os/os_android.c +++ b/src/detection/os/os_android.c @@ -5,14 +5,11 @@ void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance) { FF_UNUSED(instance); - ffStrbufInit(&os->name); - ffStrbufSetS(&os->name, "Android"); + ffStrbufInitS(&os->name, "Android"); - ffStrbufInit(&os->prettyName); - ffStrbufSetS(&os->prettyName, "Android"); + ffStrbufInitS(&os->prettyName, "Android"); - ffStrbufInit(&os->id); - ffStrbufSetS(&os->id, "android"); + ffStrbufInitS(&os->id, "android"); ffStrbufInit(&os->version); ffSettingsGetAndroidProperty("ro.build.version.release", &os->version); @@ -26,13 +23,11 @@ void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance) ffStrbufInit(&os->buildID); ffSettingsGetAndroidProperty("ro.build.id", &os->buildID); - ffStrbufInit(&os->systemName); - ffStrbufSetS(&os->systemName, instance->state.utsname.sysname); + ffStrbufInitS(&os->systemName, instance->state.utsname.sysname); - ffStrbufInit(&os->architecture); - ffStrbufSetS(&os->architecture, instance->state.utsname.machine); + ffStrbufInitS(&os->architecture, instance->state.utsname.machine); - ffStrbufInitA(&os->idLike, 0); - ffStrbufInitA(&os->variant, 0); - ffStrbufInitA(&os->variantID, 0); + ffStrbufInit(&os->idLike); + ffStrbufInit(&os->variant); + ffStrbufInit(&os->variantID); } diff --git a/src/detection/terminalfont/terminalfont_android.c b/src/detection/terminalfont/terminalfont_android.c index 8dd1ff2fe..eaa4fa52d 100644 --- a/src/detection/terminalfont/terminalfont_android.c +++ b/src/detection/terminalfont/terminalfont_android.c @@ -31,7 +31,7 @@ const char* detectTermux(const FFinstance* instance, FFTerminalFontResult* termi 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"; goto exit; @@ -49,7 +49,7 @@ exit: #else FF_UNUSED(terminalFont); - ffStrbufSetS(&terminalFont->error, "fastfetch is built without freetype2 support"); + return "fastfetch is built without freetype2 support"; #endif }