rewrite the emulator to use UTF-8 internally
This commit is contained in:
@@ -523,7 +523,7 @@ json_init(void)
|
||||
|
||||
|
||||
void
|
||||
json_load(int drive, wchar_t *fn)
|
||||
json_load(int drive, char *fn)
|
||||
{
|
||||
double bit_rate;
|
||||
int temp_rate;
|
||||
@@ -539,10 +539,10 @@ json_load(int drive, wchar_t *fn)
|
||||
memset(dev, 0x00, sizeof(json_t));
|
||||
|
||||
/* Open the image file. */
|
||||
dev->f = plat_fopen(fn, L"rb");
|
||||
dev->f = plat_fopen(fn, "rb");
|
||||
if (dev->f == NULL) {
|
||||
free(dev);
|
||||
memset(fn, 0x00, sizeof(wchar_t));
|
||||
memset(fn, 0x00, sizeof(char));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -558,11 +558,11 @@ json_load(int drive, wchar_t *fn)
|
||||
(void)fclose(dev->f);
|
||||
free(dev);
|
||||
images[drive] = NULL;
|
||||
memset(fn, 0x00, sizeof(wchar_t));
|
||||
memset(fn, 0x00, sizeof(char));
|
||||
return;
|
||||
}
|
||||
|
||||
json_log("JSON(%d): %ls (%i tracks, %i sides, %i sectors)\n",
|
||||
json_log("JSON(%d): %s (%i tracks, %i sides, %i sectors)\n",
|
||||
drive, fn, dev->tracks, dev->sides, dev->spt[0][0]);
|
||||
|
||||
/*
|
||||
@@ -624,7 +624,7 @@ json_load(int drive, wchar_t *fn)
|
||||
dev->f = NULL;
|
||||
free(dev);
|
||||
images[drive] = NULL;
|
||||
memset(fn, 0x00, sizeof(wchar_t));
|
||||
memset(fn, 0x00, sizeof(char));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -646,7 +646,7 @@ json_load(int drive, wchar_t *fn)
|
||||
dev->f = NULL;
|
||||
free(dev);
|
||||
images[drive] = NULL;
|
||||
memset(fn, 0x00, sizeof(wchar_t));
|
||||
memset(fn, 0x00, sizeof(char));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user