From 8f30d0cdd86ce1609213f291ea64ea1e458098aa Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Fri, 23 Sep 2022 01:27:25 +0200
Subject: [PATCH] Move inline functions to end of header

---
 run.sh              |  4 ++--
 src/util/FFstrbuf.h | 39 +++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/run.sh b/run.sh
index 472d5ffea..fa1833b0e 100755
--- a/run.sh
+++ b/run.sh
@@ -10,9 +10,9 @@ if [ -z "${CMAKE_BUILD_TYPE}" ]; then
 fi
 cmake "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" ..
 
-if [ -z "$OSTYPE" ] || [ "$OSTYPE" = "linux-gnu"* ]; then
+if [ -z "$OSTYPE" ] || [ "$OSTYPE" = "linux-gnu" ]; then
     cmake_build_args="-j$(nproc)"
-elif [ "$OSTYPE" = "darwin"* ]; then
+elif [ "$OSTYPE" = "darwin" ]; then
     cmake_build_args="-j$(sysctl -n hw.ncpu)"
 else
     cmake_build_args=""
diff --git a/src/util/FFstrbuf.h b/src/util/FFstrbuf.h
index 45ed1123d..6dff9675f 100644
--- a/src/util/FFstrbuf.h
+++ b/src/util/FFstrbuf.h
@@ -26,13 +26,6 @@ void ffStrbufInit(FFstrbuf* strbuf);
 void ffStrbufInitA(FFstrbuf* strbuf, uint32_t allocate);
 void ffStrbufInitCopy(FFstrbuf* strbuf, const FFstrbuf* src);
 
-static inline void ffStrbufAppendS(FFstrbuf* strbuf, const char* value);
-static inline void ffStrbufInitS(FFstrbuf* strbuf, const char* str)
-{
-    ffStrbufInitA(strbuf, 0);
-    ffStrbufAppendS(strbuf, str);
-}
-
 void ffStrbufEnsureFree(FFstrbuf* strbuf, uint32_t free);
 
 FF_C_NODISCARD uint32_t ffStrbufGetFree(const FFstrbuf* strbuf);
@@ -46,13 +39,6 @@ void ffStrbufAppendC(FFstrbuf* strbuf, char c);
 
 void ffStrbufAppendNS(FFstrbuf* strbuf, uint32_t length, const char* value);
 
-static inline void ffStrbufAppendS(FFstrbuf* strbuf, const char* value)
-{
-    if(value == NULL)
-        return;
-    ffStrbufAppendNS(strbuf, (uint32_t) strlen(value), value);
-}
-
 void ffStrbufAppendNSExludingC(FFstrbuf* strbuf, uint32_t length, const char* value, char exclude);
 void ffStrbufAppendTransformS(FFstrbuf* strbuf, const char* value, int(*transformFunc)(int));
 FF_C_PRINTF(2, 3) void ffStrbufAppendF(FFstrbuf* strbuf, const char* format, ...);
@@ -64,12 +50,6 @@ void ffStrbufPrependNS(FFstrbuf* strbuf, uint32_t length, const char* value);
 void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value);
 void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value);
 
-static inline void ffStrbufSetS(FFstrbuf* strbuf, const char* value)
-{
-    ffStrbufClear(strbuf);
-    ffStrbufAppendNS(strbuf, (uint32_t) strlen(value), value);
-}
-
 FF_C_NODISCARD int ffStrbufComp(const FFstrbuf* strbuf, const FFstrbuf* comp);
 FF_C_NODISCARD int ffStrbufCompS(const FFstrbuf* strbuf, const char* comp);
 
@@ -127,4 +107,23 @@ FF_C_NODISCARD uint16_t ffStrbufToUInt16(const FFstrbuf* strbuf, uint16_t defaul
 
 void ffStrbufDestroy(FFstrbuf* strbuf);
 
+static inline void ffStrbufAppendS(FFstrbuf* strbuf, const char* value)
+{
+    if(value == NULL)
+        return;
+    ffStrbufAppendNS(strbuf, (uint32_t) strlen(value), value);
+}
+
+static inline void ffStrbufSetS(FFstrbuf* strbuf, const char* value)
+{
+    ffStrbufClear(strbuf);
+    ffStrbufAppendNS(strbuf, (uint32_t) strlen(value), value);
+}
+
+static inline void ffStrbufInitS(FFstrbuf* strbuf, const char* str)
+{
+    ffStrbufInitA(strbuf, 0);
+    ffStrbufAppendS(strbuf, str);
+}
+
 #endif