FFstrbuf: remove ffStrbufRemoveStringsV; rename ffStrbufRemoveStringsA to ffStrbufRemoveStrings

src/detection/cpu/cpu.c

@@ -14,7 +14,7 @@ const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu)
         " 2-Core", " 4-Core", " 6-Core", " 8-Core", " 10-Core", " 12-Core", " 14-Core", " 16-Core",
         " with Radeon Graphics"
     };
-    ffStrbufRemoveStringsA(&cpu->name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
+    ffStrbufRemoveStrings(&cpu->name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
     ffStrbufSubstrBeforeFirstC(&cpu->name, '@'); //Cut the speed output in the name as we append our own
     ffStrbufTrimRight(&cpu->name, ' '); //If we removed the @ in previous step there was most likely a space before it
     return NULL;

src/detection/gpu/gpu_linux.c

@@ -80,7 +80,7 @@ static void drmDetectDeviceName(FFGPUResult* gpu, PCIData* pci, struct pci_dev*
         " (TM)", "(TM)",
         " Graphics Adapter", " Graphics", " Series", " Edition"
     };
-    ffStrbufRemoveStringsA(&gpu->name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
+    ffStrbufRemoveStrings(&gpu->name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
 }
 
 static void pciDetectDeviceName(FFGPUResult* gpu, PCIData* pci, struct pci_dev* device)

src/detection/terminalshell/terminalshell_linux.c

@@ -299,7 +299,7 @@ static void getShellVersionGeneric(FFstrbuf* exe, const char* exeName, FFstrbuf*
         NULL
     });
     ffStrbufSubstrBeforeFirstC(version, '(');
-    ffStrbufRemoveStrings(version, 2, "-release", "release");
+    ffStrbufRemoveStrings(version, 2, (const char*[]) { "-release", "release" });
 }
 
 bool fftsGetShellVersion(FFstrbuf* exe, const char* exeName, FFstrbuf* version);

src/detection/wmtheme/wmtheme_linux.c

@@ -164,7 +164,7 @@ static bool detectOpenbox(const FFstrbuf* dePrettyName, FFstrbuf* themeOrError)
         if(strstr(line, "<name>") != 0)
         {
             ffStrbufAppendS(themeOrError, line);
-            ffStrbufRemoveStrings(themeOrError, 2, "<name>", "</name>");
+            ffStrbufRemoveStrings(themeOrError, 2, (const char*[]) { "<name>", "</name>" });
             ffStrbufTrimRight(themeOrError, '\n');
             ffStrbufTrim(themeOrError, ' ');
             break;

src/modules/media/media.c

@@ -63,7 +63,7 @@ void ffPrintMedia(FFMediaOptions* options)
         "[Lyric Video]", "[Official Lyric Video]", "[Lyrics]",
         "| Lyric Video", "| Official Lyric Video", "| Lyrics",
     };
-    ffStrbufRemoveStringsA(&songPretty, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
+    ffStrbufRemoveStrings(&songPretty, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
     ffStrbufTrimRight(&songPretty, ' ');
 
     if(songPretty.length == 0)

src/util/FFstrbuf.c

@@ -269,26 +269,12 @@ void ffStrbufRemoveS(FFstrbuf* strbuf, const char* str)
         ffStrbufRemoveSubstr(strbuf, i, i + stringLength);
 }
 
-void ffStrbufRemoveStringsA(FFstrbuf* strbuf, uint32_t numStrings, const char* strings[])
+void ffStrbufRemoveStrings(FFstrbuf* strbuf, uint32_t numStrings, const char* strings[])
 {
     for(uint32_t i = 0; i < numStrings; i++)
         ffStrbufRemoveS(strbuf, strings[i]);
 }
 
-void ffStrbufRemoveStringsV(FFstrbuf* strbuf, uint32_t numStrings, va_list arguments)
-{
-    for(uint32_t i = 0; i < numStrings; i++)
-        ffStrbufRemoveS(strbuf, va_arg(arguments, const char*));
-}
-
-void ffStrbufRemoveStrings(FFstrbuf* strbuf, uint32_t numStrings, ...)
-{
-    va_list argp;
-    va_start(argp, numStrings);
-    ffStrbufRemoveStringsV(strbuf, numStrings, argp);
-    va_end(argp);
-}
-
 uint32_t ffStrbufNextIndexC(const FFstrbuf* strbuf, uint32_t start, char c)
 {
     assert(start <= strbuf->length);

src/util/FFstrbuf.h

@@ -59,9 +59,7 @@ void ffStrbufTrim(FFstrbuf* strbuf, char c);
 
 void ffStrbufRemoveSubstr(FFstrbuf* strbuf, uint32_t startIndex, uint32_t endIndex);
 void ffStrbufRemoveS(FFstrbuf* strbuf, const char* str);
-void ffStrbufRemoveStringsA(FFstrbuf* strbuf, uint32_t numStrings, const char* strings[]);
-void ffStrbufRemoveStringsV(FFstrbuf* strbuf, uint32_t numStrings, va_list arguments);
-void ffStrbufRemoveStrings(FFstrbuf* strbuf, uint32_t numStrings, ...);
+void ffStrbufRemoveStrings(FFstrbuf* strbuf, uint32_t numStrings, const char* strings[]);
 
 FF_C_NODISCARD uint32_t ffStrbufNextIndexC(const FFstrbuf* strbuf, uint32_t start, char c);
 FF_C_NODISCARD uint32_t ffStrbufNextIndexS(const FFstrbuf* strbuf, uint32_t start, const char* str);

tests/strbuf.c

@@ -129,7 +129,7 @@ int main(void)
 
     //removeStrings
 
-    ffStrbufRemoveStrings(&strbuf, 3, "23", "45", "9");
+    ffStrbufRemoveStrings(&strbuf, 3, (const char*[]) { "23", "45", "9" });
 
     VERIFY(strbuf.length == 2);
     VERIFY(strcmp(strbuf.chars, "16") == 0);