Apple-2-Tools/ewm
1
0
Fork 0
mirror of https://github.com/st3fan/ewm.git synced 2025-04-05 00:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #99 Replace usage of strsep() with strtok_r()

Browse Source
This commit is contained in:
Stefan Arentz 2016-12-26 16:51:28 -05:00
parent 762c746aef
commit 2aef5568fa
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mem.c
View File

@ -191,26 +191,23 @@ void mem_mod_byte_indy(struct cpu_t *cpu, uint8_t addr, mem_mod_t op) {
// For parsing --memory options
struct ewm_memory_option_t *parse_memory_option(char *s) {
char *type = strsep(&s, ":");
if (type == NULL) { // || (strcmp(type, "ram") && strcmp(type, "rom"))) {
printf("type fail\n");
char *type = strtok(s, ":");
if (type == NULL || (strcmp(type, "ram") != 0 && strcmp(type, "rom") != 0)) {
return NULL;
}
char *address = strsep(&s, ":");
char *address = strtok(NULL, ":");
if (address == NULL) {
printf("address fail\n");
return NULL;
}
char *path = strsep(&s, ":");
char *path = strtok(NULL, ":");
if (path == NULL) {
printf("path fail\n");
return NULL;
}
struct ewm_memory_option_t *m = (struct ewm_memory_option_t*) malloc(sizeof(struct ewm_memory_option_t));
m->type = strcmp(type, "ram") ? EWM_MEMORY_TYPE_RAM : EWM_MEMORY_TYPE_ROM;
m->type = strcmp(type, "ram") == 0 ? EWM_MEMORY_TYPE_RAM : EWM_MEMORY_TYPE_ROM;
m->path = path;
m->address = atoi(address);
m->next = NULL;