From 778856dd57425e71ee8a37a08f37db0ba8341cc6 Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Mon, 25 Jul 2022 12:24:23 +0200 Subject: [PATCH] Refactor: move property functions to own header --- src/common/properties.c | 1 + src/common/properties.h | 21 +++++++++++++++++++++ src/detection/displayserver/wmde.c | 1 + src/detection/gtk.c | 1 + src/detection/os.c | 1 + src/detection/qt.c | 1 + src/fastfetch.h | 16 ---------------- src/modules/cpu.c | 1 + src/modules/cursor.c | 1 + src/modules/locale.c | 1 + src/modules/packages.c | 1 + src/modules/terminalfont.c | 1 + src/modules/wmtheme.c | 1 + 13 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 src/common/properties.h diff --git a/src/common/properties.c b/src/common/properties.c index 3c45854f6..8331c6b3f 100644 --- a/src/common/properties.c +++ b/src/common/properties.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/properties.h" #include diff --git a/src/common/properties.h b/src/common/properties.h new file mode 100644 index 000000000..72e662b1c --- /dev/null +++ b/src/common/properties.h @@ -0,0 +1,21 @@ +#pragma once + +#ifndef FF_INCLUDED_common_properties +#define FF_INCLUDED_common_properties + +typedef struct FFpropquery +{ + const char* start; + FFstrbuf* buffer; +} FFpropquery; + +bool ffParsePropLine(const char* line, const char* start, FFstrbuf* buffer); +bool ffParsePropLines(const char* lines, const char* start, FFstrbuf* buffer); +bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquery* queries); +bool ffParsePropFile(const char* filename, const char* start, FFstrbuf* buffer); +bool ffParsePropFileHomeValues(const FFinstance* instance, const char* relativeFile, uint32_t numQueries, FFpropquery* queries); +bool ffParsePropFileHome(const FFinstance* instance, const char* relativeFile, const char* start, FFstrbuf* buffer); +bool ffParsePropFileConfigValues(const FFinstance* instance, const char* relativeFile, uint32_t numQueries, FFpropquery* queries); +bool ffParsePropFileConfig(const FFinstance* instance, const char* relativeFile, const char* start, FFstrbuf* buffer); + +#endif diff --git a/src/detection/displayserver/wmde.c b/src/detection/displayserver/wmde.c index 896202b14..8e501d19c 100644 --- a/src/detection/displayserver/wmde.c +++ b/src/detection/displayserver/wmde.c @@ -1,5 +1,6 @@ #include "displayServer.h" #include "common/io.h" +#include "common/properties.h" #include #include diff --git a/src/detection/gtk.c b/src/detection/gtk.c index 7733780da..efdf70fa9 100644 --- a/src/detection/gtk.c +++ b/src/detection/gtk.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/properties.h" #include diff --git a/src/detection/os.c b/src/detection/os.c index ef975555a..4be767d50 100644 --- a/src/detection/os.c +++ b/src/detection/os.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/properties.h" #include #include diff --git a/src/detection/qt.c b/src/detection/qt.c index 2b8f8afae..4c679779d 100644 --- a/src/detection/qt.c +++ b/src/detection/qt.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/properties.h" #include #include diff --git a/src/fastfetch.h b/src/fastfetch.h index 23b79e391..d1f56e5ec 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -371,12 +371,6 @@ typedef struct FFfont FFlist styles; } FFfont; -typedef struct FFpropquery -{ - const char* start; - FFstrbuf* buffer; -} FFpropquery; - ////////////////////// // Common functions // ////////////////////// @@ -413,16 +407,6 @@ void ffPrintAndWriteToCache(FFinstance* instance, const char* moduleName, const void ffCachingWriteData(const FFinstance* instance, const char* moduleName, size_t dataSize, const void* data); bool ffCachingReadData(const FFinstance* instance, const char* moduleName, size_t dataSize, void* data); -//common/properties.c -bool ffParsePropLine(const char* line, const char* start, FFstrbuf* buffer); -bool ffParsePropLines(const char* lines, const char* start, FFstrbuf* buffer); -bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquery* queries); -bool ffParsePropFile(const char* filename, const char* start, FFstrbuf* buffer); -bool ffParsePropFileHomeValues(const FFinstance* instance, const char* relativeFile, uint32_t numQueries, FFpropquery* queries); -bool ffParsePropFileHome(const FFinstance* instance, const char* relativeFile, const char* start, FFstrbuf* buffer); -bool ffParsePropFileConfigValues(const FFinstance* instance, const char* relativeFile, uint32_t numQueries, FFpropquery* queries); -bool ffParsePropFileConfig(const FFinstance* instance, const char* relativeFile, const char* start, FFstrbuf* buffer); - //common/font.c void ffFontInitQt(FFfont* font, const char* data); void ffFontInitPango(FFfont* font, const char* data); diff --git a/src/modules/cpu.c b/src/modules/cpu.c index 802e72dab..165ebfb2b 100644 --- a/src/modules/cpu.c +++ b/src/modules/cpu.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/io.h" +#include "common/properties.h" #include diff --git a/src/modules/cursor.c b/src/modules/cursor.c index 9b978a620..fb6453b86 100644 --- a/src/modules/cursor.c +++ b/src/modules/cursor.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/properties.h" #include diff --git a/src/modules/locale.c b/src/modules/locale.c index ebc775a12..8e200757f 100644 --- a/src/modules/locale.c +++ b/src/modules/locale.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/properties.h" #include diff --git a/src/modules/packages.c b/src/modules/packages.c index f2d74fda6..c5f1f869c 100644 --- a/src/modules/packages.c +++ b/src/modules/packages.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/io.h" +#include "common/properties.h" #include #include diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c index 26d5d6943..a1796426d 100644 --- a/src/modules/terminalfont.c +++ b/src/modules/terminalfont.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/properties.h" #define FF_TERMFONT_MODULE_NAME "Terminal Font" #define FF_TERMFONT_NUM_FORMAT_ARGS 5 diff --git a/src/modules/wmtheme.c b/src/modules/wmtheme.c index 771b35f36..856a45f46 100644 --- a/src/modules/wmtheme.c +++ b/src/modules/wmtheme.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "common/properties.h" #include #include