From 536f914f3e6f7aa30251fb52005f63752980ce60 Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Mon, 25 Jul 2022 13:15:01 +0200 Subject: [PATCH] Refactor: move printing functions to own header --- src/common/caching.c | 1 + src/common/printing.c | 1 + src/common/printing.h | 16 ++++++++++++++++ src/fastfetch.c | 1 + src/fastfetch.h | 9 --------- src/logo/image/image.c | 1 + src/logo/logo.c | 1 + src/modules/battery.c | 1 + src/modules/break.c | 1 + src/modules/colors.c | 1 + src/modules/cpu.c | 1 + src/modules/cpuUsage.c | 1 + src/modules/cursor.c | 1 + src/modules/custom.c | 1 + src/modules/date.c | 1 + src/modules/datetime.c | 1 + src/modules/de.c | 1 + src/modules/disk.c | 1 + src/modules/font.c | 1 + src/modules/gpu.c | 1 + src/modules/host.c | 1 + src/modules/icons.c | 1 + src/modules/kernel.c | 1 + src/modules/locale.c | 1 + src/modules/localip.c | 1 + src/modules/memory.c | 1 + src/modules/opencl.c | 1 + src/modules/opengl.c | 1 + src/modules/os.c | 1 + src/modules/packages.c | 1 + src/modules/player.c | 1 + src/modules/processes.c | 1 + src/modules/publicip.c | 1 + src/modules/resolution.c | 1 + src/modules/separator.c | 1 + src/modules/shell.c | 1 + src/modules/song.c | 1 + src/modules/terminal.c | 1 + src/modules/terminalfont.c | 1 + src/modules/theme.c | 1 + src/modules/time.c | 1 + src/modules/title.c | 1 + src/modules/uptime.c | 1 + src/modules/vulkan.c | 1 + src/modules/wm.c | 1 + src/modules/wmtheme.c | 1 + 46 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 src/common/printing.h diff --git a/src/common/caching.c b/src/common/caching.c index c2a029868..265d8308e 100644 --- a/src/common/caching.c +++ b/src/common/caching.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/io.h" +#include "common/printing.h" #include diff --git a/src/common/printing.c b/src/common/printing.c index 0ed701344..44acf4f65 100644 --- a/src/common/printing.c +++ b/src/common/printing.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat) { diff --git a/src/common/printing.h b/src/common/printing.h new file mode 100644 index 000000000..7f285e428 --- /dev/null +++ b/src/common/printing.h @@ -0,0 +1,16 @@ +#pragma once + +#ifndef FF_INCLUDED_common_printing +#define FF_INCLUDED_common_printing + +#include "fastfetch.h" + +void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat); +void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* format, uint32_t numArgs, const FFformatarg* arguments); +void ffPrintFormat(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, uint32_t numArgs, const FFformatarg* arguments); +void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customErrorFormat, const char* message, ...); +void ffPrintError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, const char* message, ...); +void ffPrintColor(const FFstrbuf* colorValue); +void ffPrintCharTimes(char c, uint32_t times); + +#endif diff --git a/src/fastfetch.c b/src/fastfetch.c index 5648e46f8..399c81858 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include #include diff --git a/src/fastfetch.h b/src/fastfetch.h index d1f56e5ec..c607ae6fe 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -385,15 +385,6 @@ void ffListFeatures(); //common/threading.c void ffStartDetectionThreads(FFinstance* instance); -//common/printing.c -void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat); -void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* format, uint32_t numArgs, const FFformatarg* arguments); -void ffPrintFormat(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, uint32_t numArgs, const FFformatarg* arguments); -void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customErrorFormat, const char* message, ...); -void ffPrintError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, const char* message, ...); -void ffPrintColor(const FFstrbuf* colorValue); -void ffPrintCharTimes(char c, uint32_t times); - //common/caching.c void ffCacheValidate(FFinstance* instance); diff --git a/src/logo/image/image.c b/src/logo/image/image.c index 233409db3..f9cf1e06b 100644 --- a/src/logo/image/image.c +++ b/src/logo/image/image.c @@ -1,5 +1,6 @@ #include "image.h" #include "common/io.h" +#include "common/printing.h" #if defined(FF_HAVE_IMAGEMAGICK7) || defined(FF_HAVE_IMAGEMAGICK6) diff --git a/src/logo/logo.c b/src/logo/logo.c index aeb807de7..6cda62028 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -1,5 +1,6 @@ #include "logo.h" #include "common/io.h" +#include "common/printing.h" #include #include diff --git a/src/modules/battery.c b/src/modules/battery.c index 3bf1ad0e8..d6c7f2587 100644 --- a/src/modules/battery.c +++ b/src/modules/battery.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/io.h" +#include "common/printing.h" #include diff --git a/src/modules/break.c b/src/modules/break.c index 5ccc71462..45b09e5fd 100644 --- a/src/modules/break.c +++ b/src/modules/break.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" void ffPrintBreak(FFinstance* instance) { diff --git a/src/modules/colors.c b/src/modules/colors.c index c513bb351..626ced7b0 100644 --- a/src/modules/colors.c +++ b/src/modules/colors.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" void ffPrintColors(FFinstance* instance) { diff --git a/src/modules/cpu.c b/src/modules/cpu.c index 165ebfb2b..134119373 100644 --- a/src/modules/cpu.c +++ b/src/modules/cpu.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "common/io.h" #include "common/properties.h" +#include "common/printing.h" #include diff --git a/src/modules/cpuUsage.c b/src/modules/cpuUsage.c index 41d23d6c7..c4b56873d 100644 --- a/src/modules/cpuUsage.c +++ b/src/modules/cpuUsage.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include diff --git a/src/modules/cursor.c b/src/modules/cursor.c index fb6453b86..f4a3c103f 100644 --- a/src/modules/cursor.c +++ b/src/modules/cursor.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/properties.h" +#include "common/printing.h" #include diff --git a/src/modules/custom.c b/src/modules/custom.c index c5c7849bf..50b96607c 100644 --- a/src/modules/custom.c +++ b/src/modules/custom.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" void ffPrintCustom(FFinstance* instance, const char* key, const char* value) { diff --git a/src/modules/date.c b/src/modules/date.c index f232ef4d1..5eb102a69 100644 --- a/src/modules/date.c +++ b/src/modules/date.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_DATE_MODULE_NAME "Date" diff --git a/src/modules/datetime.c b/src/modules/datetime.c index bd6a7c278..c6e6e2db6 100644 --- a/src/modules/datetime.c +++ b/src/modules/datetime.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_DATETIME_MODULE_NAME "Date & Time" #define FF_DATETIME_NUM_FORMAT_ARGS 20 diff --git a/src/modules/de.c b/src/modules/de.c index fe611c60d..4e090dcf1 100644 --- a/src/modules/de.c +++ b/src/modules/de.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_DE_MODULE_NAME "DE" #define FF_DE_NUM_FORMAT_ARGS 3 diff --git a/src/modules/disk.c b/src/modules/disk.c index 1363c415b..923293cb1 100644 --- a/src/modules/disk.c +++ b/src/modules/disk.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include diff --git a/src/modules/font.c b/src/modules/font.c index f32063529..92af25655 100644 --- a/src/modules/font.c +++ b/src/modules/font.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_FONT_MODULE_NAME "Font" #define FF_FONT_NUM_FORMAT_ARGS 21 diff --git a/src/modules/gpu.c b/src/modules/gpu.c index 43a8203cf..f65b2df98 100644 --- a/src/modules/gpu.c +++ b/src/modules/gpu.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include diff --git a/src/modules/host.c b/src/modules/host.c index a8c3e6ae3..654443114 100644 --- a/src/modules/host.c +++ b/src/modules/host.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include diff --git a/src/modules/icons.c b/src/modules/icons.c index 9dfd652be..916d49bc3 100644 --- a/src/modules/icons.c +++ b/src/modules/icons.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_ICONS_MODULE_NAME "Icons" #define FF_ICONS_NUM_FORMAT_ARGS 5 diff --git a/src/modules/kernel.c b/src/modules/kernel.c index 9b66b665d..062b04f42 100644 --- a/src/modules/kernel.c +++ b/src/modules/kernel.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_KERNEL_MODULE_NAME "Kernel" #define FF_KERNEL_NUM_FORMAT_ARGS 3 diff --git a/src/modules/locale.c b/src/modules/locale.c index 8e200757f..360c9a2f5 100644 --- a/src/modules/locale.c +++ b/src/modules/locale.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/properties.h" +#include "common/printing.h" #include diff --git a/src/modules/localip.c b/src/modules/localip.c index 35f9f4324..1d8192df4 100644 --- a/src/modules/localip.c +++ b/src/modules/localip.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_LOCALIP_MODULE_NAME "Local IP" #define FF_LOCALIP_NUM_FORMAT_ARGS 1 diff --git a/src/modules/memory.c b/src/modules/memory.c index 95b86a9f8..cb0f09cbd 100644 --- a/src/modules/memory.c +++ b/src/modules/memory.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include diff --git a/src/modules/opencl.c b/src/modules/opencl.c index 3fe3c15b3..932ff8eef 100644 --- a/src/modules/opencl.c +++ b/src/modules/opencl.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_OPENCL_MODULE_NAME "OpenCL" #define FF_OPENCL_NUM_FORMAT_ARGS 3 diff --git a/src/modules/opengl.c b/src/modules/opengl.c index 9bed5b866..86bdf4652 100644 --- a/src/modules/opengl.c +++ b/src/modules/opengl.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include diff --git a/src/modules/os.c b/src/modules/os.c index a95ede86e..2d6703878 100644 --- a/src/modules/os.c +++ b/src/modules/os.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include diff --git a/src/modules/packages.c b/src/modules/packages.c index c5f1f869c..e4b0b8549 100644 --- a/src/modules/packages.c +++ b/src/modules/packages.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "common/io.h" #include "common/properties.h" +#include "common/printing.h" #include #include diff --git a/src/modules/player.c b/src/modules/player.c index a161f4b65..994411f7a 100644 --- a/src/modules/player.c +++ b/src/modules/player.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include diff --git a/src/modules/processes.c b/src/modules/processes.c index eb0467f51..cb7713a06 100644 --- a/src/modules/processes.c +++ b/src/modules/processes.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_PROCESSES_MODULE_NAME "Processes" #define FF_PROCESSES_NUM_FORMAT_ARGS 1 diff --git a/src/modules/publicip.c b/src/modules/publicip.c index b93fde1e2..6a74b2af8 100644 --- a/src/modules/publicip.c +++ b/src/modules/publicip.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_PUBLICIP_MODULE_NAME "Public IP" #define FF_PUBLICIP_NUM_FORMAT_ARGS 1 diff --git a/src/modules/resolution.c b/src/modules/resolution.c index e0c1b4b41..1872cc780 100644 --- a/src/modules/resolution.c +++ b/src/modules/resolution.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_RESOLUTION_MODULE_NAME "Resolution" #define FF_RESOLUTION_NUM_FORMAT_ARGS 3 diff --git a/src/modules/separator.c b/src/modules/separator.c index 28df99486..4504aa5cc 100644 --- a/src/modules/separator.c +++ b/src/modules/separator.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" void ffPrintSeparator(FFinstance* instance) { diff --git a/src/modules/shell.c b/src/modules/shell.c index 83d03cea3..f68bca4be 100644 --- a/src/modules/shell.c +++ b/src/modules/shell.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_SHELL_MODULE_NAME "Shell" #define FF_SHELL_NUM_FORMAT_ARGS 7 diff --git a/src/modules/song.c b/src/modules/song.c index a5b1abb35..0466b5d93 100644 --- a/src/modules/song.c +++ b/src/modules/song.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include diff --git a/src/modules/terminal.c b/src/modules/terminal.c index 1b51e9b5c..e3f56b852 100644 --- a/src/modules/terminal.c +++ b/src/modules/terminal.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #include diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c index a1796426d..96b7c8ace 100644 --- a/src/modules/terminalfont.c +++ b/src/modules/terminalfont.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/properties.h" +#include "common/printing.h" #define FF_TERMFONT_MODULE_NAME "Terminal Font" #define FF_TERMFONT_NUM_FORMAT_ARGS 5 diff --git a/src/modules/theme.c b/src/modules/theme.c index 4f8184115..e1ab7c73f 100644 --- a/src/modules/theme.c +++ b/src/modules/theme.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_THEME_MODULE_NAME "Theme" #define FF_THEME_NUM_FORMAT_ARGS 7 diff --git a/src/modules/time.c b/src/modules/time.c index 13670b90c..9d236e5be 100644 --- a/src/modules/time.c +++ b/src/modules/time.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_TIME_MODULE_NAME "Time" diff --git a/src/modules/title.c b/src/modules/title.c index 95bb65337..be6d8749a 100644 --- a/src/modules/title.c +++ b/src/modules/title.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" static inline void printTitlePart(FFinstance* instance, const FFstrbuf* content) { diff --git a/src/modules/uptime.c b/src/modules/uptime.c index 14a804103..1e7be5159 100644 --- a/src/modules/uptime.c +++ b/src/modules/uptime.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_UPTIME_MODULE_NAME "Uptime" #define FF_UPTIME_NUM_FORMAT_ARGS 4 diff --git a/src/modules/vulkan.c b/src/modules/vulkan.c index 3a196c1b6..c116c1bc6 100644 --- a/src/modules/vulkan.c +++ b/src/modules/vulkan.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_VULKAN_MODULE_NAME "Vulkan" #define FF_VULKAN_NUM_FORMAT_ARGS 3 diff --git a/src/modules/wm.c b/src/modules/wm.c index fa3d392a1..c3f6ffd75 100644 --- a/src/modules/wm.c +++ b/src/modules/wm.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/printing.h" #define FF_WM_MODULE_NAME "WM" #define FF_WM_NUM_FORMAT_ARGS 3 diff --git a/src/modules/wmtheme.c b/src/modules/wmtheme.c index 856a45f46..826ac049a 100644 --- a/src/modules/wmtheme.c +++ b/src/modules/wmtheme.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/properties.h" +#include "common/printing.h" #include #include