commit 6cc5b6a

shrub  ·  2026-08-18 16:47:52 +0000 UTC
parent 862e88e
use gzread instead of gzfread
1 files changed,  +6, -6
+6, -6
 1@@ -45,7 +45,7 @@ tern_node * config;
 2 #include <zlib.h>
 3 #define ROMFILE gzFile
 4 #define romopen gzopen
 5-#define romread gzfread
 6+#define romread gzread
 7 #define romseek gzseek
 8 #define romgetc gzgetc
 9 #define romclose gzclose
10@@ -69,14 +69,14 @@ int load_smd_rom(ROMFILE f, void **buffer)
11 	dst = buf = malloc(filesize);
12 	
13 
14-	size_t read;
15+	int read;
16 	do {
17 		if ((readsize + SMD_BLOCK_SIZE > filesize)) {
18 			filesize *= 2;
19 			buf = realloc(buf, filesize);
20 			dst = buf + readsize/sizeof(uint16_t);
21 		}
22-		read = romread(block, 1, SMD_BLOCK_SIZE, f);
23+		read = romread(f, block, SMD_BLOCK_SIZE);
24 		if (read > 0) {
25 			dst = process_smd_block(dst, block, read);
26 			readsize += read;
27@@ -164,7 +164,7 @@ uint32_t load_rom(const char * filename, void **dst, system_type *stype)
28 	if (!f) {
29 		return 0;
30 	}
31-	if (sizeof(header) != romread(header, 1, sizeof(header), f)) {
32+	if (sizeof(header) != romread(f, header, sizeof(header))) {
33 		fatal_error("Error reading from %s\n", filename);
34 	}
35 	
36@@ -181,9 +181,9 @@ uint32_t load_rom(const char * filename, void **dst, system_type *stype)
37 	char *buf = malloc(filesize);
38 	memcpy(buf, header, readsize);
39 	
40-	size_t read;
41+	int read;
42 	do {
43-		read = romread(buf + readsize, 1, filesize - readsize, f);
44+		read = romread(f, buf + readsize, filesize - readsize);
45 		if (read > 0) {
46 			readsize += read;
47 			if (readsize == filesize) {