From 17914dc29e76a2c357bdbce448c8e77539c24c80 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui@live.cn>
Date: Sat, 13 Jun 2026 08:25:59 +0800
Subject: [PATCH] Global: unifies `FF_STR` macro

---
 src/common/impl/init.c            | 3 +--
 src/common/impl/netif_gnu.c       | 4 +---
 src/common/strutil.h              | 3 +++
 src/detection/gpu/gpu_pci.c       | 4 +---
 src/detection/libc/libc_android.c | 4 +---
 src/detection/libc/libc_linux.c   | 4 +---
 src/detection/os/os_linux.c       | 3 ---
 src/detection/version/version.c   | 4 +---
 8 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/common/impl/init.c b/src/common/impl/init.c
index b24660eeb..9cebbbe7b 100644
--- a/src/common/impl/init.c
+++ b/src/common/impl/init.c
@@ -3,6 +3,7 @@
 #include "common/parsing.h"
 #include "common/thread.h"
 #include "common/textModifier.h"
+#include "common/strutil.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/terminaltheme/terminaltheme.h"
 #include "logo/logo.h"
@@ -184,8 +185,6 @@ void ffDestroyInstance(void) {
 #endif
 #if FF_HAVE_QUICKJS
     #include <quickjs.h>
-    #define FF_STR_INDIR(x) #x
-    #define FF_STR(x) FF_STR_INDIR(x)
 #endif
 
 // Must be in a file compiled with the libfastfetch target, because the FF_HAVE* macros are not defined for the executable targets
diff --git a/src/common/impl/netif_gnu.c b/src/common/impl/netif_gnu.c
index d2feed5be..6593899a6 100644
--- a/src/common/impl/netif_gnu.c
+++ b/src/common/impl/netif_gnu.c
@@ -1,12 +1,10 @@
 #include "common/netif.h"
 #include "common/io.h"
+#include "common/strutil.h"
 
 #include <net/if.h>
 #include <stdio.h>
 
-#define FF_STR_INDIR(x) #x
-#define FF_STR(x) FF_STR_INDIR(x)
-
 bool ffNetifGetDefaultRouteImplV4(FFNetifDefaultRouteResult* result) {
     FILE* FF_AUTO_CLOSE_FILE netRoute = fopen("/proc/route", "r");
 
diff --git a/src/common/strutil.h b/src/common/strutil.h
index f21528fb5..6d8b639b1 100644
--- a/src/common/strutil.h
+++ b/src/common/strutil.h
@@ -14,6 +14,9 @@ __stdcall char* StrStrIA(const char* lpFirst, const char* lpSrch);
     #define strcasestr StrStrIA
 #endif
 
+#define FF_STR_INDIR(x) #x
+#define FF_STR(x) FF_STR_INDIR(x)
+
 static inline bool ffStrSet(const char* str) {
     if (str == NULL) {
         return false;
diff --git a/src/detection/gpu/gpu_pci.c b/src/detection/gpu/gpu_pci.c
index 63cd877c7..c3772fd91 100644
--- a/src/detection/gpu/gpu_pci.c
+++ b/src/detection/gpu/gpu_pci.c
@@ -2,6 +2,7 @@
 #include "common/io.h"
 #include "common/properties.h"
 #include "common/memrchr.h"
+#include "common/strutil.h"
 
 #include <stdlib.h>
 #ifdef __FreeBSD__
@@ -22,9 +23,6 @@
     #include "fastfetch_amdgpuids.c.inc"
 #endif
 
-#define FF_STR_INDIR(x) #x
-#define FF_STR(x) FF_STR_INDIR(x)
-
 static const FFstrbuf* loadPciIds() {
     static FFstrbuf pciids;
 
diff --git a/src/detection/libc/libc_android.c b/src/detection/libc/libc_android.c
index 2aec4ed20..9d7762c78 100644
--- a/src/detection/libc/libc_android.c
+++ b/src/detection/libc/libc_android.c
@@ -1,7 +1,5 @@
 #include "libc.h"
-
-#define FF_STR_INDIR(x) #x
-#define FF_STR(x) FF_STR_INDIR(x)
+#include "common/strutil.h"
 
 #include <features.h>
 
diff --git a/src/detection/libc/libc_linux.c b/src/detection/libc/libc_linux.c
index 53186a356..a445c7b9b 100644
--- a/src/detection/libc/libc_linux.c
+++ b/src/detection/libc/libc_linux.c
@@ -1,7 +1,5 @@
 #include "libc.h"
-
-#define FF_STR_INDIR(x) #x
-#define FF_STR(x) FF_STR_INDIR(x)
+#include "common/strutil.h"
 
 #include <features.h>
 
diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c
index fc653a3c6..d3eeb4326 100644
--- a/src/detection/os/os_linux.c
+++ b/src/detection/os/os_linux.c
@@ -8,9 +8,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define FF_STR_INDIR(x) #x
-#define FF_STR(x) FF_STR_INDIR(x)
-
 static bool parseLsbRelease(const char* fileName, FFOSResult* result) {
     return ffParsePropFileValues(fileName, 4, (FFpropquery[]) {
                                                   { "DISTRIB_ID =", &result->id },
diff --git a/src/detection/version/version.c b/src/detection/version/version.c
index 8bd066ec0..b3c35141c 100644
--- a/src/detection/version/version.c
+++ b/src/detection/version/version.c
@@ -1,4 +1,5 @@
 #include "version.h"
+#include "common/strutil.h"
 
 #if defined(__x86_64__)
     #define FF_ARCHITECTURE "x86_64"
@@ -62,9 +63,6 @@
     #define FF_SYSNAME "Unknown"
 #endif
 
-#define FF_STR_INDIR(x) #x
-#define FF_STR(x) FF_STR_INDIR(x)
-
 FFVersionResult ffVersionResult = {
     .projectName = FASTFETCH_PROJECT_NAME,
     .sysName = FF_SYSNAME,