gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few charmap bugs maybe?

Browse Source
This commit is contained in:
stag019
2014-10-31 10:48:54 -04:00
parent af506985e5
commit 004bc2e50e
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/asm/charmap.c
View File

@@ -23,7 +23,7 @@
#include "asm/main.h" #include "asm/main.h"
#include "asm/output.h" #include "asm/output.h"
struct Charmap globalCharmap; struct Charmap globalCharmap = {0};
extern struct Section *pCurrentSection; extern struct Section *pCurrentSection;
@@ -67,7 +67,7 @@ int
charmap_Add(char *input, UBYTE output) charmap_Add(char *input, UBYTE output)
{ {
int i, input_length; int i, input_length;
char temp1i[CHARMAPLENGTH + 1], temp2i[CHARMAPLENGTH + 1], temp1o, temp2o; char temp1i[CHARMAPLENGTH + 1], temp2i[CHARMAPLENGTH + 1], temp1o = 0, temp2o = 0;
struct Charmap *charmap; struct Charmap *charmap;
@@ -79,7 +79,7 @@ charmap_Add(char *input, UBYTE output)
} }
else else
{ {
if((charmap = (struct Charmap *) malloc(sizeof(struct Charmap))) == NULL) if((charmap = (struct Charmap *) calloc(1, sizeof(struct Charmap))) == NULL)
{ {
fatalerror("Not enough memory for charmap"); fatalerror("Not enough memory for charmap");
} }
@@ -110,7 +110,7 @@ charmap_Add(char *input, UBYTE output)
if(input_length > strlen(charmap -> input[i])) if(input_length > strlen(charmap -> input[i]))
{ {
memcpy(temp1i, charmap -> input[i], CHARMAPLENGTH + 1); memcpy(temp1i, charmap -> input[i], CHARMAPLENGTH + 1);
memcpy(charmap -> input[i], input, CHARMAPLENGTH + 1); memcpy(charmap -> input[i], input, input_length);
temp1o = charmap -> output[i]; temp1o = charmap -> output[i];
charmap -> output[i] = output; charmap -> output[i] = output;
i++; i++;
@@ -133,7 +133,7 @@ charmap_Add(char *input, UBYTE output)
} }
else else
{ {
memcpy(charmap -> input[charmap -> count], input, CHARMAPLENGTH + 1); memcpy(charmap -> input[charmap -> count], input, input_length);
charmap -> output[charmap -> count] = output; charmap -> output[charmap -> count] = output;
} }
return ++charmap -> count; return ++charmap -> count;
@@ -157,7 +157,6 @@ charmap_Convert(char **input)
charmap = &globalCharmap; charmap = &globalCharmap;
} }
length = 0;
input_temp = *input; input_temp = *input;
if((buffer = (char *) malloc(strlen(*input))) == NULL) if((buffer = (char *) malloc(strlen(*input))) == NULL)
{ {