diff --git a/src/common/processing.h b/src/common/processing.h new file mode 100644 index 000000000..8bb67be85 --- /dev/null +++ b/src/common/processing.h @@ -0,0 +1,10 @@ +#pragma once + +#ifndef FF_INCLUDED_common_processing +#define FF_INCLUDED_common_processing + +#include "util/FFstrbuf.h" + +void ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[]); + +#endif diff --git a/src/common/settings.h b/src/common/settings.h index e0413e608..8980020af 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -23,6 +23,8 @@ typedef union FFvariant }; } FFvariant; +#define FF_VARIANT_NULL ((FFvariant){.strValue = NULL}) + FFvariant ffSettingsGetDConf(FFinstance* instance, const char* key, FFvarianttype type); FFvariant ffSettingsGetGSettings(FFinstance* instance, const char* schemaName, const char* path, const char* key, FFvarianttype type); FFvariant ffSettingsGet(FFinstance* instance, const char* dconfKey, const char* gsettingsSchemaName, const char* gsettingsPath, const char* gsettingsKey, FFvarianttype type); diff --git a/src/detection/displayserver/wmde.c b/src/detection/displayserver/wmde.c index 796ea2d64..f844e1a3c 100644 --- a/src/detection/displayserver/wmde.c +++ b/src/detection/displayserver/wmde.c @@ -2,6 +2,7 @@ #include "common/io.h" #include "common/properties.h" #include "common/parsing.h" +#include "common/processing.h" #include #include diff --git a/src/detection/terminalShell.c b/src/detection/terminalShell.c index f408f110a..d4e8e4945 100644 --- a/src/detection/terminalShell.c +++ b/src/detection/terminalShell.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "common/io.h" #include "common/parsing.h" +#include "common/processing.h" #include #include diff --git a/src/fastfetch.h b/src/fastfetch.h index 6eb0d9506..fd1ed0d46 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -310,8 +310,6 @@ typedef struct FFDateTimeResult FFstrbuf secondPretty; //37 } FFDateTimeResult; -#define FF_VARIANT_NULL ((FFvariant){.strValue = NULL}) - ////////////////////// // Common functions // ////////////////////// @@ -326,9 +324,6 @@ void ffListFeatures(); //common/threading.c void ffStartDetectionThreads(FFinstance* instance); -//common/processing.c -void ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[]); - //common/networking.c void ffNetworkingGetHttp(const char* host, const char* path, uint32_t timeout, FFstrbuf* buffer); diff --git a/src/modules/packages.c b/src/modules/packages.c index 7f18ed3b4..5b71380c4 100644 --- a/src/modules/packages.c +++ b/src/modules/packages.c @@ -3,6 +3,7 @@ #include "common/properties.h" #include "common/printing.h" #include "common/settings.h" +#include "common/processing.h" #include #include diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c index 27859bf33..428e1feac 100644 --- a/src/modules/terminalfont.c +++ b/src/modules/terminalfont.c @@ -3,6 +3,7 @@ #include "common/printing.h" #include "common/font.h" #include "common/settings.h" +#include "common/processing.h" #define FF_TERMFONT_MODULE_NAME "Terminal Font" #define FF_TERMFONT_NUM_FORMAT_ARGS 5