remove util/strings

there was a copy of clibs/strings in util that caused conflicts.
eressea · Aug 26, 2023 · 9c52e33 · 9c52e33
1 parent d7dd6f4
commit 9c52e33
Show file tree

Hide file tree

Showing 65 changed files with 107 additions and 861 deletions.
diff --git a/clibs b/clibs
diff --git a/se/eressea.vpj b/se/eressea.vpj
@@ -354,7 +354,6 @@
             <F N="../src/kernel/spellbook.c"/>
             <F N="../src/spells/spells.c"/>
             <F N="../src/spy.c"/>
-            <F N="../src/util/strings.c"/>
             <F N="../critbit/strtolh.c"/>
             <F N="../src/study.c"/>
             <F N="../src/summary.c"/>

diff --git a/src/attributes/dict.c b/src/attributes/dict.c
@@ -14,8 +14,8 @@
 #include <util/log.h>
 #include <kernel/gamedata.h>
 #include <util/resolve.h>
-#include <util/strings.h>
 
+#include <strings.h>
 #include <storage.h>
 
 /* stdc includes */

diff --git a/src/attributes/racename.c b/src/attributes/racename.c
@@ -1,7 +1,8 @@
 #include "racename.h"
 
 #include <kernel/attrib.h>
-#include <util/strings.h>
+
+#include <strings.h>
 
 /* libc includes */
 #include <stdlib.h>

diff --git a/src/attributes/raceprefix.c b/src/attributes/raceprefix.c
@@ -1,7 +1,8 @@
 #include "raceprefix.h"
 
 #include <kernel/attrib.h>
-#include <util/strings.h>
+
+#include <strings.h>
 
 #include <assert.h>
 #include <string.h>

diff --git a/src/battle.c b/src/battle.c
@@ -52,11 +52,11 @@
 #include "util/macros.h"
 #include "util/message.h"
 #include "util/parser.h"
-#include "util/strings.h"
 #include "util/stats.h"
 #include "util/rand.h"
 #include "util/rng.h"
 
+#include <strings.h>
 #include <selist.h>
 
 /* libc includes */

diff --git a/src/battle.test.c b/src/battle.test.c
@@ -28,9 +28,10 @@
 #include "util/language.h"
 #include "util/message.h"
 #include "util/rand.h"
-#include "util/strings.h"
 #include "util/variant.h"
 
+#include <strings.h>
+
 #include <CuTest.h>
 
 #include <stdbool.h>

diff --git a/src/bind_building.c b/src/bind_building.c
@@ -7,7 +7,8 @@
 
 #include <util/log.h>
 #include <util/language.h>
-#include <util/strings.h>
+
+#include <strings.h>
 
 #include <lua.h>
 #include <lauxlib.h>

diff --git a/src/bind_config.c b/src/bind_config.c
@@ -11,7 +11,8 @@
 #include <util/language.h>
 #include <util/log.h>
 #include <util/path.h>
-#include <util/strings.h>
+
+#include <strings.h>
 
 #include <cJSON.h>
 

diff --git a/src/bind_region.c b/src/bind_region.c
@@ -22,7 +22,8 @@
 #include <util/base36.h>
 #include <util/log.h>
 #include <util/message.h>
-#include <util/strings.h>
+
+#include <strings.h>
 
 #include <attributes/key.h>
 #include <attributes/racename.h>

diff --git a/src/bind_ship.c b/src/bind_ship.c
@@ -13,7 +13,8 @@
 
 #include <util/language.h>
 #include <util/log.h>
-#include <util/strings.h>
+
+#include <strings.h>
 
 #include <tolua.h>
 #include <lauxlib.h>

diff --git a/src/bind_unit.c b/src/bind_unit.c
@@ -38,10 +38,10 @@
 #include <util/base36.h>
 #include <util/log.h>
 #include <util/order_parser.h>        // for OP_Parser, OrderParserStruct
-#include <util/strings.h>
 #include <util/variant.h>
 
 #include <selist.h>
+#include <strings.h>
 
 #include <stb_ds.h>
 

diff --git a/src/creport.c b/src/creport.c
@@ -63,16 +63,16 @@ static char g_bigbuf[BUFFERSIZE];
 #include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/crmessage.h>
-#include <util/strings.h>
 #include <util/language.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/message.h>
 #include <util/nrmessage.h>
 
-#include <selist.h>
 #include <filestream.h>
+#include <selist.h>
 #include <stream.h>
+#include <strings.h>
 
 #include <stb_ds.h>
 

diff --git a/src/defaults.c b/src/defaults.c
@@ -49,7 +49,6 @@
 #include <util/path.h>
 #include <util/rand.h>
 #include <util/rng.h>
-#include <util/strings.h>
 #include <util/umlaut.h>
 #include <util/unicode.h>
 
@@ -64,8 +63,9 @@
 #include <spells/regioncurse.h>
 #include <spells/unitcurse.h>
 
-#include <selist.h>
 #include <iniparser.h>
+#include <selist.h>
+#include <strings.h>
 
 #include <stb_ds.h>
 

diff --git a/src/eressea.c b/src/eressea.c
@@ -52,7 +52,7 @@
 #include "vortex.h"
 #include "wormhole.h"
 
-#include <util/strings.h>
+#include <strings.h>
 
 #include <assert.h>
 #include <errno.h>

diff --git a/src/exparse.c b/src/exparse.c
@@ -21,7 +21,8 @@
 #include "util/message.h"
 #include "util/crmessage.h"
 #include "util/nrmessage.h"
-#include "util/strings.h"
+
+#include <strings.h>
 
 #include <expat.h>
 #include <stb_ds.h>

diff --git a/src/gamedb.c b/src/gamedb.c
@@ -5,7 +5,7 @@
 #include "kernel/faction.h"
 #include "kernel/db/driver.h"
 
-#include "util/strings.h"
+#include <strings.h>
 
 static int generate_factions(void *data, db_faction *results, int nresults)
 {

diff --git a/src/jsonconf.c b/src/jsonconf.c
@@ -38,8 +38,8 @@
 #include "util/param.h"
 #include "util/path.h"
 #include "util/pofile.h"
-#include "util/strings.h"
 
+#include <strings.h>
 
 /* external libraries */
 #include <stb_ds.h>

diff --git a/src/kernel/alliance.c b/src/kernel/alliance.c
@@ -20,10 +20,10 @@
 #include <util/message.h>
 #include <util/parser.h>
 #include <util/rng.h>
-#include <util/strings.h>
 #include <util/umlaut.h>
 
 #include <selist.h>
+#include <strings.h>
 
 /* libc includes */
 #include <assert.h>

diff --git a/src/kernel/ally.c b/src/kernel/ally.c
@@ -11,10 +11,10 @@
 #include "objtypes.h"
 
 #include <kernel/attrib.h>
-#include <util/strings.h>
 #include <kernel/gamedata.h>
 
 #include <storage.h>
+#include <strings.h>
 
 #include <assert.h>
 #include <string.h>

diff --git a/src/kernel/attrib.c b/src/kernel/attrib.c
@@ -1,12 +1,12 @@
 #include "attrib.h"
 
 #include <util/log.h>
-#include <util/strings.h>
 #include <util/variant.h>
 #include <kernel/gamedata.h>
 
-#include <storage.h>
 #include <critbit.h>
+#include <storage.h>
+#include <strings.h>
 
 #include <assert.h>
 #include <string.h>

diff --git a/src/kernel/attrib.test.c b/src/kernel/attrib.test.c
@@ -1,14 +1,16 @@
 #include "attrib.h"
 
 #include <kernel/gamedata.h>
-#include <util/strings.h>
 #include <util/variant.h>     // for variant
 
+#include <memstream.h>
 #include <storage.h>
 #include <stream.h>           // for stream, stream_i
-#include <memstream.h>
+#include <strings.h>
+
 #include <CuTest.h>
 #include <tests.h>
+
 #include <string.h>
 
 static void test_attrib_new(CuTest * tc)

diff --git a/src/kernel/build.c b/src/kernel/build.c
@@ -39,7 +39,8 @@
 #include <util/param.h>
 #include <util/parser.h>
 #include <util/resolve.h>
-#include <util/strings.h>
+
+#include <strings.h>
 
 /* from libc */
 #include <assert.h>

diff --git a/src/kernel/building.c b/src/kernel/building.c
@@ -26,12 +26,12 @@
 #include <util/param.h>
 #include <util/resolve.h>
 #include <util/rng.h>
-#include <util/strings.h>
 #include <util/umlaut.h>
 
-#include <storage.h>
-#include <selist.h>
 #include <critbit.h>
+#include <selist.h>
+#include <storage.h>
+#include <strings.h>
 
 /* libc includes */
 #include <assert.h>

diff --git a/src/kernel/building.test.c b/src/kernel/building.test.c
@@ -8,9 +8,10 @@
 #include "region.h"
 #include "unit.h"
 
-#include <util/strings.h>
 #include "util/variant.h"  // for variant
 
+#include <strings.h>
+
 #include <CuTest.h>
 #include <tests.h>
 #include <stdbool.h>       // for false, true

diff --git a/src/kernel/connection.c b/src/kernel/connection.c
@@ -12,10 +12,10 @@
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/rng.h>
-#include <util/strings.h>
 
 #include <selist.h>
 #include <storage.h>
+#include <strings.h>
 
 /* libc includes */
 #include <assert.h>

diff --git a/src/kernel/equipment.c b/src/kernel/equipment.c
@@ -15,7 +15,8 @@
 #include <util/log.h>
 #include <util/rand.h>
 #include <util/rng.h>
-#include <util/strings.h>
+
+#include <strings.h>
 
 /* libc includes */
 #include <assert.h>

diff --git a/src/kernel/event.c b/src/kernel/event.c
@@ -4,9 +4,9 @@
 /* util includes */
 #include <kernel/gamedata.h>
 #include <util/log.h>
-#include <util/strings.h>
 
 #include <storage.h>
+#include <strings.h>
 
 /* libc includes */
 #include <assert.h>

diff --git a/src/kernel/faction.c b/src/kernel/faction.c
@@ -42,11 +42,11 @@
 #include <util/password.h>
 #include <util/path.h>
 #include <util/rng.h>
-#include <util/strings.h>
 #include <util/variant.h>
 
 #include <selist.h>
 #include <storage.h>
+#include <strings.h>
 
 /* libc includes */
 #include <assert.h>

diff --git a/src/kernel/group.c b/src/kernel/group.c
@@ -15,10 +15,10 @@
 #include <util/base36.h>
 #include <kernel/gamedata.h>
 #include <util/resolve.h>
-#include <util/strings.h>
 #include <util/unicode.h>
 
 #include <storage.h>
+#include <strings.h>
 
 /* libc includes */
 #include <assert.h>

diff --git a/src/kernel/item.c b/src/kernel/item.c
@@ -28,11 +28,11 @@
 #include <util/macros.h>
 #include <util/message.h>
 #include <util/rng.h>
-#include <util/strings.h>
 #include <util/umlaut.h>
 
 #include <critbit.h>
 #include <storage.h>
+#include <strings.h>
 
 /* libc includes */
 #include <assert.h>

diff --git a/src/kernel/order.c b/src/kernel/order.c
@@ -14,9 +14,9 @@
 #include <util/log.h>
 #include <util/param.h>
 #include <util/parser.h>
-#include <util/strings.h>
 
 #include <stream.h>
+#include <strings.h>
 
 /* libc includes */
 #include <assert.h>

diff --git a/src/kernel/plane.c b/src/kernel/plane.c
@@ -8,10 +8,10 @@
 /* util includes */
 #include <kernel/attrib.h>
 #include <util/resolve.h>
-#include <util/strings.h>
 #include <util/lists.h>
 
 #include <storage.h>
+#include <strings.h>
 
 /* libc includes */
 #include <assert.h>

diff --git a/src/kernel/race.c b/src/kernel/race.c
@@ -27,10 +27,10 @@
 #include <util/language.h>
 #include <util/log.h>
 #include <util/rng.h>
-#include <util/strings.h>
 #include <util/variant.h>
 
 #include <storage.h>
+#include <strings.h>
 
 /* attrib includes */
 #include <attributes/raceprefix.h>
+31 −18		strings.c
+36 −48		strings.h
+5 −0		test_cmdline.c
+9 −0		test_strings.c