char *data_dir = getUserDataDir();
char *userlevel_subdir = LEVELS_DIRECTORY;
- if (userlevel_dir)
- free(userlevel_dir);
+ checked_free(userlevel_dir);
if (level_subdir != NULL)
userlevel_dir = getPath3(data_dir, userlevel_subdir, level_subdir);
return userlevel_dir;
}
-static char *getTapeDir(char *level_subdir)
-{
- static char *tape_dir = NULL;
- char *data_dir = getUserDataDir();
- char *tape_subdir = TAPES_DIRECTORY;
-
- if (tape_dir)
- free(tape_dir);
-
- if (level_subdir != NULL)
- tape_dir = getPath3(data_dir, tape_subdir, level_subdir);
- else
- tape_dir = getPath2(data_dir, tape_subdir);
-
- return tape_dir;
-}
-
static char *getScoreDir(char *level_subdir)
{
static char *score_dir = NULL;
char *data_dir = getCommonDataDir();
char *score_subdir = SCORES_DIRECTORY;
- if (score_dir)
- free(score_dir);
+ checked_free(score_dir);
if (level_subdir != NULL)
score_dir = getPath3(data_dir, score_subdir, level_subdir);
char *data_dir = getUserDataDir();
char *levelsetup_subdir = LEVELSETUP_DIRECTORY;
- if (levelsetup_dir)
- free(levelsetup_dir);
+ checked_free(levelsetup_dir);
if (level_subdir != NULL)
levelsetup_dir = getPath3(data_dir, levelsetup_subdir, level_subdir);
if (node == NULL)
return options.level_directory;
- if (level_dir)
- free(level_dir);
+ checked_free(level_dir);
level_dir = getPath2((node->user_defined ? getUserLevelDir(NULL) :
options.level_directory), node->fullpath);
return getLevelDirFromTreeInfo(leveldir_current);
}
+static char *getTapeDir(char *level_subdir)
+{
+ static char *tape_dir = NULL;
+ char *data_dir = getUserDataDir();
+ char *tape_subdir = TAPES_DIRECTORY;
+
+ checked_free(tape_dir);
+
+ if (level_subdir != NULL)
+ tape_dir = getPath3(data_dir, tape_subdir, level_subdir);
+ else
+ tape_dir = getPath2(data_dir, tape_subdir);
+
+ return tape_dir;
+}
+
+static char *getSolutionTapeDir()
+{
+ static char *tape_dir = NULL;
+ char *data_dir = getCurrentLevelDir();
+ char *tape_subdir = TAPES_DIRECTORY;
+
+ checked_free(tape_dir);
+
+ tape_dir = getPath2(data_dir, tape_subdir);
+
+ return tape_dir;
+}
+
static char *getDefaultGraphicsDir(char *graphics_subdir)
{
static char *graphics_dir = NULL;
if (graphics_subdir == NULL)
return options.graphics_directory;
- if (graphics_dir)
- free(graphics_dir);
+ checked_free(graphics_dir);
graphics_dir = getPath2(options.graphics_directory, graphics_subdir);
if (sounds_subdir == NULL)
return options.sounds_directory;
- if (sounds_dir)
- free(sounds_dir);
+ checked_free(sounds_dir);
sounds_dir = getPath2(options.sounds_directory, sounds_subdir);
if (music_subdir == NULL)
return options.music_directory;
- if (music_dir)
- free(music_dir);
+ checked_free(music_dir);
music_dir = getPath2(options.music_directory, music_subdir);
{
static char *artwork_dir = NULL;
- if (artwork_dir != NULL)
- free(artwork_dir);
+ checked_free(artwork_dir);
artwork_dir = getPath2(ti->basepath, ti->fullpath);
artwork_path_ptr = &(LEVELDIR_ARTWORK_PATH(leveldir_current, ti->type));
artwork_set_ptr = &(LEVELDIR_ARTWORK_SET( leveldir_current, ti->type));
- if (*artwork_path_ptr != NULL)
- free(*artwork_path_ptr);
+ checked_free(*artwork_path_ptr);
if ((level_artwork = getTreeInfoFromIdentifier(ti, *artwork_set_ptr)))
*artwork_path_ptr = getStringCopy(getSetupArtworkDir(level_artwork));
char *dir = getPath2(getCurrentLevelDir(), ARTWORK_DIRECTORY(ti->type));
- if (*artwork_set_ptr != NULL)
- free(*artwork_set_ptr);
+ checked_free(*artwork_set_ptr);
if (fileExists(dir))
{
static char *filename = NULL;
char basename[MAX_FILENAME_LEN];
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
if (nr < 0)
sprintf(basename, "template.%s", LEVELFILE_EXTENSION);
static char *filename = NULL;
char basename[MAX_FILENAME_LEN];
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION);
filename = getPath2(getTapeDir(leveldir_current->filename), basename);
return filename;
}
+char *getSolutionTapeFilename(int nr)
+{
+ static char *filename = NULL;
+ char basename[MAX_FILENAME_LEN];
+
+ checked_free(filename);
+
+ sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION);
+ filename = getPath2(getSolutionTapeDir(), basename);
+
+ return filename;
+}
+
char *getScoreFilename(int nr)
{
static char *filename = NULL;
char basename[MAX_FILENAME_LEN];
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
sprintf(basename, "%03d.%s", nr, SCOREFILE_EXTENSION);
filename = getPath2(getScoreDir(leveldir_current->filename), basename);
{
static char *filename = NULL;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
filename = getPath2(getSetupDir(), SETUP_FILENAME);
{
static char *filename = NULL;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
filename = getPath2(getSetupDir(), EDITORSETUP_FILENAME);
{
static char *filename = NULL;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
filename = getPath2(getCurrentLevelDir(), HELPANIM_FILENAME);
{
static char *filename = NULL;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
filename = getPath2(getCurrentLevelDir(), HELPTEXT_FILENAME);
static char *filename = NULL;
char *basenames[] =
{
- "readme",
- "readme.txt",
"README",
"README.txt",
"README.TXT",
+ "Readme",
+ "Readme.txt",
+ "readme",
+ "readme.txt",
NULL
};
for (i = 0; basenames[i] != NULL; i++)
{
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
filename = getPath2(getCurrentLevelDir(), basenames[i]);
if (fileExists(filename))
{
static char *msdos_filename = NULL;
- if (msdos_filename != NULL)
- free(msdos_filename);
+ checked_free(msdos_filename);
msdos_filename = getStringCopy(basename_corrected);
strncpy(&msdos_filename[8], &basename[strlen(basename) - (1+3)], 1+3 +1);
static char *filename = NULL;
boolean skip_setup_artwork = FALSE;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
basename = getCorrectedArtworkBasename(basename);
static char *filename = NULL;
boolean skip_setup_artwork = FALSE;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
basename = getCorrectedArtworkBasename(basename);
static char *filename = NULL;
boolean skip_setup_artwork = FALSE;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
basename = getCorrectedArtworkBasename(basename);
{
static char *filename = NULL;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
filename = getPath2(getLevelArtworkDir(type), ARTWORKINFO_FILENAME(type));
static char *directory = NULL;
boolean skip_setup_artwork = FALSE;
- if (directory != NULL)
- free(directory);
+ checked_free(directory);
if (!setup.override_level_music)
{
int i;
static char entry[MAX_LINE_LEN];
+ /* if value is an empty string, just return token without value */
+ if (*value == '\0')
+ return token;
+
/* start with the token and some spaces to format output line */
sprintf(entry, "%s:", token);
for (i = strlen(entry); i < TOKEN_VALUE_POSITION; i++)
if (list == NULL)
return;
- if (list->token)
- free(list->token);
- if (list->value)
- free(list->value);
+ checked_free(list->token);
+ checked_free(list->value);
+
if (list->next)
freeSetupFileList(list->next);
+
free(list);
}
if (strcmp(list->token, token) == 0)
{
- if (list->value)
- free(list->value);
+ checked_free(list->value);
list->value = getStringCopy(value);
Error(ERR_EXIT, "cannot insert into hash -- aborting");
}
+char *removeHashEntry(SetupFileHash *hash, char *token)
+{
+ if (hash == NULL)
+ return NULL;
+
+ return remove_hash_entry(hash, token);
+}
+
#if 0
#ifdef DEBUG
static void printSetupFileHash(SetupFileHash *hash)
static void *loadSetupFileData(char *filename, boolean use_hash)
{
- int line_len;
char line[MAX_LINE_LEN], previous_line[MAX_LINE_LEN];
char *token, *value, *line_ptr;
void *setup_file_data, *insert_ptr = NULL;
if (*line == '\0')
continue;
- line_len = strlen(line);
-
/* cut leading whitespaces from token */
for (token = line; *token; token++)
if (*token != ' ' && *token != '\t')
break;
- /* find end of token */
+ /* start with empty value as reliable default */
+ value = "";
+
+ /* find end of token to determine start of value */
for (line_ptr = token; *line_ptr; line_ptr++)
{
if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':')
{
- *line_ptr = '\0';
+ *line_ptr = '\0'; /* terminate token string */
+ value = line_ptr + 1; /* set beginning of value */
+
break;
}
}
- if (line_ptr < line + line_len)
- value = line_ptr + 1;
- else
-#if 1
- value = "true"; /* treat tokens without value as "true" */
-#else
- value = "\0";
-#endif
-
/* cut leading whitespaces from value */
for (; *value; value++)
if (*value != ' ' && *value != '\t')
break;
- if (*token && *value)
+#if 0
+ if (*value == '\0')
+ value = "true"; /* treat tokens without value as "true" */
+#endif
+
+ if (*token)
{
if (use_hash)
setHashEntry((SetupFileHash *)setup_file_data, token, value);
static void freeTreeInfo(TreeInfo *ldi)
{
- if (ldi->filename)
- free(ldi->filename);
- if (ldi->fullpath)
- free(ldi->fullpath);
- if (ldi->basepath)
- free(ldi->basepath);
- if (ldi->identifier)
- free(ldi->identifier);
-
- if (ldi->name)
- free(ldi->name);
- if (ldi->name_sorting)
- free(ldi->name_sorting);
- if (ldi->author)
- free(ldi->author);
-
- if (ldi->class_desc)
- free(ldi->class_desc);
+ checked_free(ldi->filename);
+ checked_free(ldi->fullpath);
+ checked_free(ldi->basepath);
+ checked_free(ldi->identifier);
+
+ checked_free(ldi->name);
+ checked_free(ldi->name_sorting);
+ checked_free(ldi->author);
+
+ checked_free(ldi->class_desc);
if (ldi->type == TREE_TYPE_LEVEL_DIR)
{
- if (ldi->graphics_set)
- free(ldi->graphics_set);
- if (ldi->sounds_set)
- free(ldi->sounds_set);
- if (ldi->music_set)
- free(ldi->music_set);
-
- if (ldi->graphics_path)
- free(ldi->graphics_path);
- if (ldi->sounds_path)
- free(ldi->sounds_path);
- if (ldi->music_path)
- free(ldi->music_path);
+ checked_free(ldi->graphics_set);
+ checked_free(ldi->sounds_set);
+ checked_free(ldi->music_set);
+
+ checked_free(ldi->graphics_path);
+ checked_free(ldi->sounds_path);
+ checked_free(ldi->music_path);
}
}
break;
case TYPE_STRING:
- if (*(char **)setup_value != NULL)
- free(*(char **)setup_value);
+ checked_free(*(char **)setup_value);
*(char **)setup_value = getStringCopy(token_value);
break;
artwork_new->fullpath = getStringCopy(UNDEFINED_FILENAME);
artwork_new->basepath = getStringCopy(UNDEFINED_FILENAME);
- if (artwork_new->name != NULL)
- free(artwork_new->name);
+ checked_free(artwork_new->name);
artwork_new->identifier = getStringCopy(UNDEFINED_FILENAME);
artwork_new->name = getStringCopy(UNDEFINED_FILENAME);