From: Holger Schemel <info@artsoft.org>
Date: Fri, 23 Feb 2024 17:59:12 +0000 (+0100)
Subject: replaced glib function calls to g_strstrip() and g_strchomp()
X-Git-Tag: 4.4.0.0-test-1~299
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=156f225c639428dc2c4f816863672c73b790cce6;p=rocksndiamonds.git

replaced glib function calls to g_strstrip() and g_strchomp()
---

diff --git a/src/game_bd/bd_bdcff.c b/src/game_bd/bd_bdcff.c
index 20aba8f9..1a204a2f 100644
--- a/src/game_bd/bd_bdcff.c
+++ b/src/game_bd/bd_bdcff.c
@@ -884,7 +884,7 @@ boolean gd_caveset_load_from_bdcff(const char *contents)
 
     /* strip leading and trailing spaces AFTER checking if we are reading a map.
        map lines might begin or end with spaces */
-    g_strstrip(line);
+    stripString(line);
 
     if (reading_highscore)
     {
diff --git a/src/game_bd/bd_c64import.c b/src/game_bd/bd_c64import.c
index 921c57f1..49e0ded2 100644
--- a/src/game_bd/bd_c64import.c
+++ b/src/game_bd/bd_c64import.c
@@ -1165,7 +1165,7 @@ static int cave_copy_from_plck(GdCave *cave, const guint8 *data,
     for (j = 0; j < 12; j++)
       cave->name[j] = data[0x1f2 + j];
 
-    g_strchomp(cave->name);    /* remove spaces */
+    chompString(cave->name);    /* remove spaces */
   }
   else
   {
@@ -1457,7 +1457,7 @@ static int cave_copy_from_1stb(GdCave *cave, const guint8 *data, int remaining_b
     cave->name[i] = c;
   }
 
-  g_strchomp(cave->name);
+  chompString(cave->name);
 
   cave->intermission = data[0x389] != 0;
 
@@ -1586,7 +1586,7 @@ static int cave_copy_from_crdr_7(GdCave *cave, const guint8 *data, int remaining
     cave->name[i] = c;
   }
 
-  g_strchomp(cave->name);    /* remove trailing and leading spaces */
+  chompString(cave->name);    /* remove trailing and leading spaces */
 
   cave->selectable = data[14] != 0;
 
@@ -2033,7 +2033,7 @@ static int cave_copy_from_crli(GdCave *cave, const guint8 *data, int remaining_b
       cave->name[i] = c;
     }
 
-    g_strchomp(cave->name);    /* remove trailing and leading spaces */
+    chompString(cave->name);    /* remove trailing and leading spaces */
   }
 
   /* uncompress rle data */