projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced glib function calls to g_file_get_contents()
[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 e25fa6263a70c2acdfdec691d5afc1bf80839013..50598fb7a0ec4dbe69a68e0bc69f7bc582a4de78 100644
(file)
--- a/
src/game_bd/bd_caveset.c
+++ b/
src/game_bd/bd_caveset.c
@@
-22,7
+22,7
@@
/* this stores the caves. */
/* this stores the caves. */
-
G
List *gd_caveset;
+List *gd_caveset;
/* the data of the caveset: name, highscore, max number of lives, etc. */
GdCavesetData *gd_caveset_data;
/* the data of the caveset: name, highscore, max number of lives, etc. */
GdCavesetData *gd_caveset_data;
@@
-45,7
+45,7
@@
char *gd_caveset_extensions[] =
NULL
};
NULL
};
-#define CAVESET_OFFSET(property) (
G_
STRUCT_OFFSET(GdCavesetData, property))
+#define CAVESET_OFFSET(property) (STRUCT_OFFSET(GdCavesetData, property))
const GdStructDescriptor gd_caveset_properties[] =
{
const GdStructDescriptor gd_caveset_properties[] =
{
@@
-115,8
+115,8
@@
void gd_caveset_clear(void)
{
if (gd_caveset)
{
{
if (gd_caveset)
{
-
g_list_foreach(gd_caveset, (GFunc
) gd_cave_free, NULL);
-
g_
list_free(gd_caveset);
+
list_foreach(gd_caveset, (list_fn
) gd_cave_free, NULL);
+ list_free(gd_caveset);
gd_caveset = NULL;
}
gd_caveset = NULL;
}
@@
-135,13
+135,13
@@
void gd_caveset_clear(void)
/* return number of caves currently in memory. */
int gd_caveset_count(void)
{
/* return number of caves currently in memory. */
int gd_caveset_count(void)
{
- return
g_
list_length(gd_caveset);
+ return list_length(gd_caveset);
}
/* return index of first selectable cave */
static int caveset_first_selectable_cave_index(void)
{
}
/* return index of first selectable cave */
static int caveset_first_selectable_cave_index(void)
{
-
G
List *iter;
+ List *iter;
int i;
for (i = 0, iter = gd_caveset; iter != NULL; i++, iter = iter->next)
int i;
for (i = 0, iter = gd_caveset; iter != NULL; i++, iter = iter->next)
@@
-161,7
+161,7
@@
static int caveset_first_selectable_cave_index(void)
/* return a cave identified by its index */
GdCave *gd_return_nth_cave(const int cave)
{
/* return a cave identified by its index */
GdCave *gd_return_nth_cave(const int cave)
{
- return
g_
list_nth_data(gd_caveset, cave);
+ return list_nth_data(gd_caveset, cave);
}
/* get a selected cave from the loaded caveset (original, unmodified cave) */
}
/* get a selected cave from the loaded caveset (original, unmodified cave) */
@@
-318,11
+318,11
@@
static void brc_import(guint8 *data)
imported[level * 20 + cavenum] = cave;
if (cavenum < 16)
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
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)
/* fixed intermission caves; are smaller. */
if (cavenum >= 16)
@@
-469,20
+469,20
@@
static void brc_import(guint8 *data)
/* append to caveset or forget it. */
if (!only_dirt)
/* append to caveset or forget it. */
if (!only_dirt)
- gd_caveset =
g_
list_append(gd_caveset, cave);
+ gd_caveset = list_append(gd_caveset, cave);
else
gd_cave_free(cave);
}
}
}
else
gd_cave_free(cave);
}
}
}
-static void caveset_name_set_from_filename(c
onst c
har *filename)
+static void caveset_name_set_from_filename(char *filename)
{
char *name;
char *c;
/* make up a caveset name from the filename. */
{
char *name;
char *c;
/* make up a caveset name from the filename. */
- name = g
_path_get_basen
ame(filename);
+ name = g
etBaseN
ame(filename);
gd_strcpy(gd_caveset_data->name, name);
free(name);
gd_strcpy(gd_caveset_data->name, name);
free(name);
@@
-504,14
+504,13
@@
static void caveset_name_set_from_filename(const char *filename)
*/
boolean gd_caveset_load_from_file(char *filename)
{
*/
boolean gd_caveset_load_from_file(char *filename)
{
- GError *error = NULL;
gsize length;
char *buf;
gsize length;
char *buf;
- boolean read;
- GList *new_caveset;
+ List *new_caveset;
struct stat st;
struct stat st;
+ File *file;
- if (
g_
stat(filename, &st) != 0)
+ if (stat(filename, &st) != 0)
{
Warn("cannot stat() file");
{
Warn("cannot stat() file");
@@
-525,12
+524,22
@@
boolean gd_caveset_load_from_file(char *filename)
return FALSE;
}
return FALSE;
}
- read = g_file_get_contents (filename, &buf, &length, &error);
- if (!read)
+ if (!(file = openFile(filename, MODE_READ)))
{
{
- Warn("
%s", error->messag
e);
+ Warn("
cannot open file '%s'", filenam
e);
- g_error_free(error);
+ return FALSE;
+ }
+
+ buf = checked_malloc(st.st_size + 1);
+ length = readFile(file, buf, 1, st.st_size);
+ buf[length] = '\0';
+
+ closeFile(file);
+
+ if (length < st.st_size)
+ {
+ Warn("cannot read file '%s'", filename);
return FALSE;
}
return FALSE;
}
@@
-606,7
+615,7
@@
boolean gd_caveset_load_from_file(char *filename)
int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean repair)
{
int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean repair)
{
-
G
List *riter;
+ List *riter;
int wrong = 0;
riter = cave->replays;
int wrong = 0;
riter = cave->replays;
@@
-615,7
+624,7
@@
int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean
GdReplay *replay = (GdReplay *)riter->data;
guint32 checksum;
GdCave *rendered;
GdReplay *replay = (GdReplay *)riter->data;
guint32 checksum;
GdCave *rendered;
-
G
List *next = riter->next;
+ List *next = riter->next;
rendered = gd_cave_new_rendered(cave, replay->level, replay->seed);
checksum = gd_cave_adler_checksum(rendered);
rendered = gd_cave_new_rendered(cave, replay->level, replay->seed);
checksum = gd_cave_adler_checksum(rendered);
@@
-646,7
+655,7
@@
int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean
if (remove)
{
/* may remove */
if (remove)
{
/* may remove */
- cave->replays =
g_
list_remove_link(cave->replays, riter);
+ cave->replays = list_remove_link(cave->replays, riter);
gd_replay_free(replay);
}
}
gd_replay_free(replay);
}
}
@@
-661,7
+670,7
@@
int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean
boolean gd_caveset_has_replays(void)
{
boolean gd_caveset_has_replays(void)
{
-
G
List *citer;
+ List *citer;
/* for all caves */
for (citer = gd_caveset; citer != NULL; citer = citer->next)
/* for all caves */
for (citer = gd_caveset; citer != NULL; citer = citer->next)