Move ffPrintLogoAndKey to printing.c

Author: LinusDierheimer

src/common/printing.c

@@ -1,5 +1,46 @@
 #include "fastfetch.h"
 
+void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat)
+{
+    ffPrintLogoLine(instance);
+
+    if(!instance->config.pipe)
+    {
+        fputs(FASTFETCH_TEXT_MODIFIER_RESET FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
+
+        //If the main color is not set (e.g. none logo), this would reset in \033[m, which resets everything,
+        //including the wanted bolt from above. So we only print it, if the main color is at least one char.
+        if(instance->config.mainColor.length > 0)
+            ffPrintColor(&instance->config.mainColor);
+    }
+
+    if(customKeyFormat == NULL || customKeyFormat->length == 0)
+    {
+        fputs(moduleName, stdout);
+
+        if(moduleIndex > 0)
+            printf(" %hhu", moduleIndex);
+    }
+    else
+    {
+        FFstrbuf key;
+        ffStrbufInit(&key);
+        ffParseFormatString(&key, customKeyFormat, NULL, 1, (FFformatarg[]){
+            {FF_FORMAT_ARG_TYPE_UINT8, &moduleIndex}
+        });
+        ffStrbufWriteTo(&key, stdout);
+        ffStrbufDestroy(&key);
+    }
+
+    if(!instance->config.pipe)
+        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
+
+    ffStrbufWriteTo(&instance->config.separator, stdout);
+
+    if(!instance->config.pipe)
+        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
+}
+
 void ffPrintError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* formatString, uint32_t numFormatArgs, const char* message, ...)
 {
     if(!instance->config.showErrors)

src/fastfetch.h

@@ -456,6 +456,7 @@ void ffSuppressIO(bool suppress); // Not thread safe!
 void ffGetTerminalResponse(const char* request, const char* format, ...);
 
 //common/printing.c
+void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat);
 void ffPrintError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* formatString, uint32_t numFormatArgs, const char* message, ...);
 void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* formatString, const FFstrbuf* error, uint32_t numArgs, const FFformatarg* arguments);
 void ffPrintColor(const FFstrbuf* colorValue);
@@ -528,7 +529,6 @@ void ffPrintLogo(FFinstance* instance);
 void ffPrintRemainingLogo(FFinstance* instance);
 
 void ffPrintLogoLine(FFinstance* instance);
-void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat);
 
 void ffPrintBuiltinLogos(FFinstance* instance);
 void ffListBuiltinLogos();

src/logo/logo.c

@@ -249,44 +249,3 @@ void ffPrintRemainingLogo(FFinstance* instance)
         putchar('\n');
     }
 }
-
-void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat)
-{
-    ffPrintLogoLine(instance);
-
-    if(!instance->config.pipe)
-    {
-        fputs(FASTFETCH_TEXT_MODIFIER_RESET FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
-
-        //If the main color is not set (e.g. none logo), this would reset in \0333[m, which resets everything,
-        //including the wanted bolt from above. So we only print it, if the main color is at least one char.
-        if(instance->config.mainColor.length > 0)
-            ffPrintColor(&instance->config.mainColor);
-    }
-
-    if(customKeyFormat == NULL || customKeyFormat->length == 0)
-    {
-        fputs(moduleName, stdout);
-
-        if(moduleIndex > 0)
-            printf(" %hhu", moduleIndex);
-    }
-    else
-    {
-        FFstrbuf key;
-        ffStrbufInit(&key);
-        ffParseFormatString(&key, customKeyFormat, NULL, 1, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_UINT8, &moduleIndex}
-        });
-        ffStrbufWriteTo(&key, stdout);
-        ffStrbufDestroy(&key);
-    }
-
-    if(!instance->config.pipe)
-        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
-
-    ffStrbufWriteTo(&instance->config.separator, stdout);
-
-    if(!instance->config.pipe)
-        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
-}