added using checked memory handling functions to list handling

[rocksndiamonds.git] / src / game_bd / bd_caveset.c

diff --git a/src/game_bd/bd_caveset.c b/src/game_bd/bd_caveset.c
index 49b6e1003a3ce3af82d66ecc5f23d43429107531..36b82a5e0bb664a8c541f01ca87e59cd332f29b2 100644 (file)
--- a/src/game_bd/bd_caveset.c
+++ b/src/game_bd/bd_caveset.c
@@ -318,11 +318,11 @@ static void brc_import(guint8 *data)
       imported[level * 20 + cavenum] = cave;
 
       if (cavenum < 16)
-       g_snprintf(cave->name, sizeof(GdString), "Cave %c/%d", 'A' + cavenum,
-                  level + 1);
+       snprintf(cave->name, sizeof(GdString), "Cave %c/%d", 'A' + cavenum,
+                level + 1);
       else
-       g_snprintf(cave->name, sizeof(GdString), "Intermission %d/%d",
-                  cavenum - 15, level + 1);
+       snprintf(cave->name, sizeof(GdString), "Intermission %d/%d",
+                cavenum - 15, level + 1);
 
       /* fixed intermission caves; are smaller. */
       if (cavenum >= 16)
@@ -476,13 +476,13 @@ static void brc_import(guint8 *data)
   }
 }
 
-static void caveset_name_set_from_filename(const char *filename)
+static void caveset_name_set_from_filename(char *filename)
 {
   char *name;
   char *c;
 
   /* make up a caveset name from the filename. */
-  name = g_path_get_basename(filename);
+  name = getBaseName(filename);
   gd_strcpy(gd_caveset_data->name, name);
   free(name);
 
@@ -511,7 +511,7 @@ boolean gd_caveset_load_from_file(char *filename)
   List *new_caveset;
   struct stat st;
 
-  if (g_stat(filename, &st) != 0)
+  if (stat(filename, &st) != 0)
   {
     Warn("cannot stat() file");