projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030128-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index 7754e5e4ff42861a6d25f9c681610caca47bb7c8..dcf94aaa43d2961368a1e4c961f420bebd3ffe94 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-425,11
+425,11
@@
static char *getCorrectedImageBasename(char *basename)
{
static char *msdos_filename = NULL;
{
static char *msdos_filename = NULL;
- if (filename != NULL)
- free(filename);
+ if (
msdos_
filename != NULL)
+ free(
msdos_
filename);
- filename = getStringCopy(basename_corrected);
- strncpy(&filename[8], &basename[strlen(basename) - 1+3], 1+3 + 1);
+
msdos_
filename = getStringCopy(basename_corrected);
+ strncpy(&
msdos_
filename[8], &basename[strlen(basename) - 1+3], 1+3 + 1);
}
}
#endif
}
}
#endif
@@
-1031,7
+1031,7
@@
char *getFormattedSetupEntry(char *token, char *value)
void freeSetupFileList(struct SetupFileList *setup_file_list)
{
void freeSetupFileList(struct SetupFileList *setup_file_list)
{
- if (
!setup_file_list
)
+ if (
setup_file_list == NULL
)
return;
if (setup_file_list->token)
return;
if (setup_file_list->token)
@@
-1043,15
+1043,12
@@
void freeSetupFileList(struct SetupFileList *setup_file_list)
free(setup_file_list);
}
free(setup_file_list);
}
-st
atic st
ruct SetupFileList *newSetupFileList(char *token, char *value)
+struct SetupFileList *newSetupFileList(char *token, char *value)
{
struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList));
{
struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList));
- new->token = checked_malloc(strlen(token) + 1);
- strcpy(new->token, token);
-
- new->value = checked_malloc(strlen(value) + 1);
- strcpy(new->value, value);
+ new->token = getStringCopy(token);
+ new->value = getStringCopy(value);
new->next = NULL;
new->next = NULL;
@@
-1060,7
+1057,7
@@
static struct SetupFileList *newSetupFileList(char *token, char *value)
char *getTokenValue(struct SetupFileList *setup_file_list, char *token)
{
char *getTokenValue(struct SetupFileList *setup_file_list, char *token)
{
- if (
!setup_file_list
)
+ if (
setup_file_list == NULL
)
return NULL;
if (strcmp(setup_file_list->token, token) == 0)
return NULL;
if (strcmp(setup_file_list->token, token) == 0)
@@
-1072,14
+1069,15
@@
char *getTokenValue(struct SetupFileList *setup_file_list, char *token)
void setTokenValue(struct SetupFileList *setup_file_list,
char *token, char *value)
{
void setTokenValue(struct SetupFileList *setup_file_list,
char *token, char *value)
{
- if (
!setup_file_list
)
+ if (
setup_file_list == NULL
)
return;
if (strcmp(setup_file_list->token, token) == 0)
{
return;
if (strcmp(setup_file_list->token, token) == 0)
{
- free(setup_file_list->value);
- setup_file_list->value = checked_malloc(strlen(value) + 1);
- strcpy(setup_file_list->value, value);
+ if (setup_file_list->value)
+ free(setup_file_list->value);
+
+ setup_file_list->value = getStringCopy(value);
}
else if (setup_file_list->next == NULL)
setup_file_list->next = newSetupFileList(token, value);
}
else if (setup_file_list->next == NULL)
setup_file_list->next = newSetupFileList(token, value);