80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

rom: Little fixes to get rid of warnings

Browse Source
This commit is contained in:
David Hrdlička
2022-04-08 10:35:26 +02:00
parent 25b8f42dc6
commit 760d022432
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mem/rom.c
View File

@@ -77,11 +77,11 @@ rom_add_path(const char* path)
// Save the path, turning it into absolute if needed. // Save the path, turning it into absolute if needed.
if (!plat_path_abs((char*) path)) { if (!plat_path_abs((char*) path)) {
plat_getcwd(cwd, 1024); plat_getcwd(cwd, sizeof(cwd));
plat_path_slash(cwd); plat_path_slash(cwd);
snprintf(rom_path->path, 1024, "%s%s%c", cwd, path, 0); snprintf(rom_path->path, sizeof(rom_path->path), "%s%s", cwd, path);
} else { } else {
strncpy(rom_path->path, path, 1024); snprintf(rom_path->path, sizeof(rom_path->path), "%s", path);
} }
// Ensure the path ends with a separator. // Ensure the path ends with a separator.
@@ -98,13 +98,13 @@ rom_fopen(char *fn, char *mode)
if (strstr(fn, "roms/") == fn) { if (strstr(fn, "roms/") == fn) {
/* Relative path */ /* Relative path */
do { for(rom_path_t *rom_path = &rom_paths; rom_path != NULL; rom_path = rom_path->next) {
plat_append_filename(temp, rom_path->path, fn + 5); plat_append_filename(temp, rom_path->path, fn + 5);
if (fp = plat_fopen(temp, mode)) { if ((fp = plat_fopen(temp, mode)) != NULL) {
return fp; return fp;
} }
} while(rom_path = rom_path->next); }
return fp; return fp;
} else { } else {
@@ -122,14 +122,14 @@ rom_getfile(char *fn, char *s, int size)
if (strstr(fn, "roms/") == fn) { if (strstr(fn, "roms/") == fn) {
/* Relative path */ /* Relative path */
do { for(rom_path_t *rom_path = &rom_paths; rom_path != NULL; rom_path = rom_path->next) {
plat_append_filename(temp, rom_path->path, fn + 5); plat_append_filename(temp, rom_path->path, fn + 5);
if (rom_present(temp)) { if (rom_present(temp)) {
strncpy(s, temp, size); strncpy(s, temp, size);
return 1; return 1;
} }
} while(rom_path = rom_path->next); }
return 0; return 0;
} else { } else {