Chore: simplify fastfetch.h

Author: CarterLi

src/common/init.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/init.h"
 #include "common/parsing.h"
 #include "common/thread.h"
 #include "detection/displayserver/displayserver.h"

src/common/init.h

@@ -0,0 +1,7 @@
+#pragma once
+
+void ffInitInstance(void);
+void ffStart(void);
+void ffFinish(void);
+void ffDestroyInstance(void);
+void ffListFeatures(void);

src/common/printing.c

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "logo/logo.h"
 #include "util/textModifier.h"
 
 void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType)

src/fastfetch.c

@@ -1,9 +1,11 @@
 #include "fastfetch.h"
 #include "common/commandoption.h"
+#include "common/init.h"
 #include "common/io/io.h"
 #include "common/jsonconfig.h"
 #include "common/printing.h"
 #include "detection/version/version.h"
+#include "logo/logo.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 #include "fastfetch_datatext.h"

src/fastfetch.h

@@ -63,27 +63,3 @@ typedef struct FFinstance
 } FFinstance;
 extern FFinstance instance; // Defined in `common/init.c`
 extern FFModuleBaseInfo** ffModuleInfos[];
-
-//////////////////////
-// Init functions //
-//////////////////////
-
-//common/init.c
-void ffInitInstance();
-void ffStart();
-void ffFinish();
-void ffDestroyInstance();
-
-void ffListFeatures();
-
-////////////////////
-// Logo functions //
-////////////////////
-
-void ffLogoPrint();
-void ffLogoPrintRemaining();
-void ffLogoPrintLine();
-
-void ffLogoBuiltinPrint();
-void ffLogoBuiltinList();
-void ffLogoBuiltinListAutocompletion();

src/flashfetch.c

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 
+#include "common/init.h"
 #include "modules/modules.h"
 
 int main(void)

src/logo/logo.h

@@ -21,7 +21,13 @@ typedef struct FFlogo
 } FFlogo;
 
 //logo.c
+void ffLogoPrint(void);
 void ffLogoPrintChars(const char* data, bool doColorReplacement);
+void ffLogoPrintLine(void);
+void ffLogoPrintRemaining(void);
+void ffLogoBuiltinPrint(void);
+void ffLogoBuiltinList(void);
+void ffLogoBuiltinListAutocompletion(void);
 
 //builtin.c
 extern const FFlogo* ffLogoBuiltins[];

src/modules/break/break.c

@@ -1,4 +1,5 @@
 #include "common/printing.h"
+#include "logo/logo.h"
 #include "modules/break/break.h"
 
 void ffPrintBreak(FF_MAYBE_UNUSED FFBreakOptions* options)

src/modules/colors/colors.c

@@ -1,7 +1,8 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "util/textModifier.h"
+#include "logo/logo.h"
 #include "modules/colors/colors.h"
+#include "util/textModifier.h"
 #include "util/stringUtils.h"
 
 static inline uint8_t min(uint8_t a, uint8_t b)

src/modules/separator/separator.c

@@ -1,5 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
+#include "logo/logo.h"
 #include "modules/separator/separator.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"