aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--brlan.c1
-rw-r--r--brlyt.c3
-rw-r--r--general.h4
-rw-r--r--xml.c7
4 files changed, 9 insertions, 6 deletions
diff --git a/brlan.c b/brlan.c
index a464056..d2178fe 100644
--- a/brlan.c
+++ b/brlan.c
@@ -307,6 +307,7 @@ void parse_brlan(char* filename, char *filenameout)
}
}
mxmlSaveFile(xml, xmlFile, whitespace_cb);
+ mxmlDelete(xml);
fclose(xmlFile);
fclose(fp);
}
diff --git a/brlyt.c b/brlyt.c
index d842140..c893c7d 100644
--- a/brlyt.c
+++ b/brlyt.c
@@ -833,6 +833,7 @@ void parse_brlyt(char *filename, char *filenameout)
u8* brlyt_file = (u8*)malloc(file_size);
fseek(fp, 0, SEEK_SET);
fread(brlyt_file, file_size, 1, fp);
+ fclose(fp);
BRLYT_fileoffset = 0;
brlyt_header header;
BRLYT_ReadDataFromMemory(&header, brlyt_file, sizeof(brlyt_header));
@@ -872,6 +873,8 @@ void parse_brlyt(char *filename, char *filenameout)
mxmlSaveFile(xml, xmlFile, whitespace_cb);
fclose(xmlFile);
mxmlDelete(xml);
+ free(entries);
+ free(brlyt_file);
free(materials);
free(textures);
}
diff --git a/general.h b/general.h
index 32780f1..71b05a5 100644
--- a/general.h
+++ b/general.h
@@ -8,8 +8,8 @@
*/
#define BENZIN_VERSION_MAJOR 1
-#define BENZIN_VERSION_MINOR 1
-#define BENZIN_VERSION_BUILD 317
+#define BENZIN_VERSION_MINOR 2
+#define BENZIN_VERSION_BUILD 0
#define BENZIN_VERSION_OTHER "BETA"
#define INFORMATION_TEXT \
diff --git a/xml.c b/xml.c
index 0ab9f55..1e1b748 100644
--- a/xml.c
+++ b/xml.c
@@ -72,7 +72,6 @@ get_value(mxml_node_t *node, /* I - Node to get */
const char *whitespace_cb(mxml_node_t *node, int where)
{
/* code by Matt_P */
- char* nulled = { '\0' };
const char *name = node->value.element.name;
mxml_node_t * temp = node;
int depth = 0;
@@ -81,12 +80,12 @@ const char *whitespace_cb(mxml_node_t *node, int where)
temp = temp->parent;
}
if (where == 3 || where == 1){
- sprintf(xmlbuff, "%s", nulled);
+ return "";
}else if((node->prev && (where == 0 || node->parent)) && !(where == 2 && strncmp(name, "ua", 2) && strcmp(name, "flip") && strcmp(name, "zoom") && strcmp(name, "coords") && strcmp(name, "entries") && strcmp(name, "xmlyt") && strcmp(name, "xmlan") && strcmp(name, "entries") && strcmp(name, "triplet") && strcmp(name, "pair") && strcmp(name, "entry") && strcmp(name, "pane") && (strcmp(name, "tag") && strcmp(name, "size") && strcmp(name, "material") && strcmp(name, "colors") && strcmp(name, "subs") && strcmp(name, "font") && strcmp(name, "wnd4") && strcmp(name, "wnd4mat") && strcmp(name, "set") && strcmp(name, "coordinates"))) ){
sprintf(xmlbuff, "\n%*s", (depth-1)*4, "");
}else{
- sprintf(xmlbuff, "%s", nulled);
+ return "";
}
- return (xmlbuff);
+ return xmlbuff;
}