From c41a29a5c10b6e6329453c8b5f2faa99bf6ad1c8 Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Mon, 25 Jul 2022 13:59:19 +0200 Subject: [PATCH] Refactor: move parsing functions to own header --- src/common/parsing.c | 1 + src/common/parsing.h | 24 ++++++++++++++++++++++++ src/common/properties.h | 2 ++ src/detection/displayserver/wmde.c | 1 + src/detection/displayserver/xlib.c | 1 + src/detection/media.c | 1 + src/detection/os.c | 1 + src/detection/terminalShell.c | 1 + src/detection/vulkan.c | 1 + src/fastfetch.c | 1 + src/fastfetch.h | 16 ---------------- src/modules/cursor.c | 1 + src/modules/font.c | 1 + src/modules/gpu.c | 1 + src/modules/icons.c | 1 + src/modules/opencl.c | 1 + src/modules/opengl.c | 1 + src/modules/theme.c | 1 + src/modules/wmtheme.c | 1 + 19 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 src/common/parsing.h diff --git a/src/common/parsing.c b/src/common/parsing.c index 2ea8b30ed..f0c434fac 100644 --- a/src/common/parsing.c +++ b/src/common/parsing.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/parsing.h" bool ffStrSet(const char* str) { diff --git a/src/common/parsing.h b/src/common/parsing.h new file mode 100644 index 000000000..28dbfec98 --- /dev/null +++ b/src/common/parsing.h @@ -0,0 +1,24 @@ +#pragma once + +#ifndef FF_INCLUDED_parsing_h +#define FF_INCLUDED_parsing_h + +#include + +typedef struct FFVersion +{ + uint32_t major; + uint32_t minor; + uint32_t patch; +} FFVersion; + +#define FF_VERSION_INIT ((FFVersion) {0}) + +bool ffStrSet(const char* str); +void ffParseSemver(FFstrbuf* buffer, const FFstrbuf* major, const FFstrbuf* minor, const FFstrbuf* patch); +void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, const FFstrbuf* gtk4); + +void ffVersionToPretty(const FFVersion* version, FFstrbuf* pretty); +int8_t ffVersionCompare(const FFVersion* version1, const FFVersion* version2); + +#endif diff --git a/src/common/properties.h b/src/common/properties.h index 72e662b1c..38d79c2ec 100644 --- a/src/common/properties.h +++ b/src/common/properties.h @@ -3,6 +3,8 @@ #ifndef FF_INCLUDED_common_properties #define FF_INCLUDED_common_properties +#include "util/FFstrbuf.h" + typedef struct FFpropquery { const char* start; diff --git a/src/detection/displayserver/wmde.c b/src/detection/displayserver/wmde.c index 8e501d19c..796ea2d64 100644 --- a/src/detection/displayserver/wmde.c +++ b/src/detection/displayserver/wmde.c @@ -1,6 +1,7 @@ #include "displayServer.h" #include "common/io.h" #include "common/properties.h" +#include "common/parsing.h" #include #include diff --git a/src/detection/displayserver/xlib.c b/src/detection/displayserver/xlib.c index 861429fef..1dbcaca0c 100644 --- a/src/detection/displayserver/xlib.c +++ b/src/detection/displayserver/xlib.c @@ -2,6 +2,7 @@ #ifdef FF_HAVE_X11 #include "common/library.h" +#include "common/parsing.h" #include typedef struct X11PropertyData diff --git a/src/detection/media.c b/src/detection/media.c index 3a84adc77..c4878c807 100644 --- a/src/detection/media.c +++ b/src/detection/media.c @@ -8,6 +8,7 @@ #ifdef FF_HAVE_DBUS #include "common/library.h" +#include "common/parsing.h" #include #define FF_DBUS_ITER_CONTINUE(iterator) \ diff --git a/src/detection/os.c b/src/detection/os.c index 4be767d50..d0671f546 100644 --- a/src/detection/os.c +++ b/src/detection/os.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/properties.h" +#include "common/parsing.h" #include #include diff --git a/src/detection/terminalShell.c b/src/detection/terminalShell.c index 60cf473b8..f408f110a 100644 --- a/src/detection/terminalShell.c +++ b/src/detection/terminalShell.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/io.h" +#include "common/parsing.h" #include #include diff --git a/src/detection/vulkan.c b/src/detection/vulkan.c index f5a3083c1..7918103d8 100644 --- a/src/detection/vulkan.c +++ b/src/detection/vulkan.c @@ -5,6 +5,7 @@ #ifdef FF_HAVE_VULKAN #include "common/library.h" #include "common/io.h" +#include "common/parsing.h" #include #include diff --git a/src/fastfetch.c b/src/fastfetch.c index 399c81858..ee70e1b74 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/printing.h" +#include "common/parsing.h" #include #include diff --git a/src/fastfetch.h b/src/fastfetch.h index 4f29a798e..45f6b43a7 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -173,14 +173,6 @@ typedef struct FFinstance FFstate state; } FFinstance; -typedef struct FFVersion -{ - uint32_t major; - uint32_t minor; - uint32_t patch; -} FFVersion; -#define FF_VERSION_INIT ((FFVersion) {0}) - typedef struct FFTitleResult { FFstrbuf userName; @@ -375,14 +367,6 @@ void ffStartDetectionThreads(FFinstance* instance); void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg); void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments); -//common/parsing.c -bool ffStrSet(const char* str); -void ffParseSemver(FFstrbuf* buffer, const FFstrbuf* major, const FFstrbuf* minor, const FFstrbuf* patch); -void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, const FFstrbuf* gtk4); - -void ffVersionToPretty(const FFVersion* version, FFstrbuf* pretty); -int8_t ffVersionCompare(const FFVersion* version1, const FFVersion* version2); - //common/processing.c void ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[]); diff --git a/src/modules/cursor.c b/src/modules/cursor.c index f4a3c103f..f61da9c6e 100644 --- a/src/modules/cursor.c +++ b/src/modules/cursor.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "common/properties.h" #include "common/printing.h" +#include "common/parsing.h" #include diff --git a/src/modules/font.c b/src/modules/font.c index fedf47034..588cac6af 100644 --- a/src/modules/font.c +++ b/src/modules/font.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "common/font.h" #include "common/printing.h" +#include "common/parsing.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 9ed980aaa..ebc77cd95 100644 --- a/src/modules/gpu.c +++ b/src/modules/gpu.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "common/printing.h" #include "common/caching.h" +#include "common/parsing.h" #include diff --git a/src/modules/icons.c b/src/modules/icons.c index 916d49bc3..3583239ca 100644 --- a/src/modules/icons.c +++ b/src/modules/icons.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/printing.h" +#include "common/parsing.h" #define FF_ICONS_MODULE_NAME "Icons" #define FF_ICONS_NUM_FORMAT_ARGS 5 diff --git a/src/modules/opencl.c b/src/modules/opencl.c index 932ff8eef..316529a17 100644 --- a/src/modules/opencl.c +++ b/src/modules/opencl.c @@ -6,6 +6,7 @@ #ifdef FF_HAVE_OPENCL #include "common/library.h" +#include "common/parsing.h" #define CL_TARGET_OPENCL_VERSION 100 #include diff --git a/src/modules/opengl.c b/src/modules/opengl.c index 86bdf4652..b94feb9b5 100644 --- a/src/modules/opengl.c +++ b/src/modules/opengl.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/printing.h" +#include "common/parsing.h" #include diff --git a/src/modules/theme.c b/src/modules/theme.c index e1ab7c73f..ad1b40d19 100644 --- a/src/modules/theme.c +++ b/src/modules/theme.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/printing.h" +#include "common/parsing.h" #define FF_THEME_MODULE_NAME "Theme" #define FF_THEME_NUM_FORMAT_ARGS 7 diff --git a/src/modules/wmtheme.c b/src/modules/wmtheme.c index 826ac049a..9e1a38d85 100644 --- a/src/modules/wmtheme.c +++ b/src/modules/wmtheme.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "common/properties.h" #include "common/printing.h" +#include "common/parsing.h" #include #include