Refactor: move io functions to own header

src/common/caching.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <stdlib.h>
 

src/common/io.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <sys/stat.h>
 #include <unistd.h>

src/common/io.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_io
+#define FF_INCLUDED_common_io
+
+#include <sys/types.h> //mode_t
+
+bool ffWriteFDBuffer(int fd, const FFstrbuf* content);
+bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data);
+bool ffWriteFileBuffer(const char* fileName, const FFstrbuf* buffer);
+
+bool ffAppendFDBuffer(int fd, FFstrbuf* buffer);
+ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data);
+bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer);
+bool ffReadFileBuffer(const char* fileName, FFstrbuf* buffer);
+
+bool ffFileExists(const char* fileName, mode_t mode);
+
+// Not thread safe!
+void ffSuppressIO(bool suppress);
+
+void ffGetTerminalResponse(const char* request, const char* format, ...);
+
+#endif

src/common/processing.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <stdlib.h>
 #include <unistd.h>

src/common/settings.c

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/library.h"
+#include "common/io.h"
 
 #include <pthread.h>
 #include <string.h>

src/detection/displayserver/wayland.c

@@ -7,6 +7,7 @@
 
 #ifdef FF_HAVE_WAYLAND
 #include "common/library.h"
+#include "common/io.h"
 #include <pthread.h>
 #include <wayland-client.h>
 #include <sys/socket.h>

src/detection/displayserver/wmde.c

@@ -1,4 +1,5 @@
 #include "displayServer.h"
+#include "common/io.h"
 
 #include <stdlib.h>
 #include <ctype.h>

src/detection/temps.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <string.h>
 #include <pthread.h>

src/detection/terminalShell.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <ctype.h>
 #include <string.h>

src/detection/vulkan.c

@@ -4,6 +4,7 @@
 
 #ifdef FF_HAVE_VULKAN
 #include "common/library.h"
+#include "common/io.h"
 #include <stdlib.h>
 #include <vulkan/vulkan.h>
 

src/fastfetch.h

@@ -9,7 +9,6 @@
 #include <stdbool.h>
 
 #include <pwd.h>
-#include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/sysinfo.h>
 
@@ -392,21 +391,6 @@ void ffListFeatures();
 //common/threading.c
 void ffStartDetectionThreads(FFinstance* instance);
 
-//common/io.c
-bool ffWriteFDBuffer(int fd, const FFstrbuf* content);
-bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data);
-bool ffWriteFileBuffer(const char* fileName, const FFstrbuf* buffer);
-
-bool ffAppendFDBuffer(int fd, FFstrbuf* buffer);
-ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data);
-bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer);
-bool ffReadFileBuffer(const char* fileName, FFstrbuf* buffer);
-
-bool ffFileExists(const char* fileName, mode_t mode);
-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 ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* format, uint32_t numArgs, const FFformatarg* arguments);

src/logo/image/image.c

@@ -1,4 +1,5 @@
 #include "image.h"
+#include "common/io.h"
 
 #if defined(FF_HAVE_IMAGEMAGICK7) || defined(FF_HAVE_IMAGEMAGICK6)
 

src/logo/logo.c

@@ -1,4 +1,5 @@
 #include "logo.h"
+#include "common/io.h"
 
 #include <ctype.h>
 #include <string.h>

src/modules/battery.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <dirent.h>
 

src/modules/cpu.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <stdlib.h>
 

src/modules/host.c

@@ -5,7 +5,9 @@
 #define FF_HOST_MODULE_NAME "Host"
 #define FF_HOST_NUM_FORMAT_ARGS 15
 
-#ifdef __ANDROID__
+#ifndef __ANDROID__
+    #include "common/io.h"
+#elif
     #include <ctype.h>
 #endif
 

src/modules/packages.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <stdlib.h>
 #include <string.h>