Fix up SDL_RWops -> SDL_IOStream for SDL3 port.

icculus · icculus · commit 76773bd1c7fa · 2024-12-02T22:53:33.000-05:00
diff --git a/dirksimple_sdl.c b/dirksimple_sdl.c
@@ -75,17 +75,17 @@ void DirkSimple_writelog(const char *str)
 
 static long DirkSimple_rwops_read(DirkSimple_Io *io, void *buf, long buflen)
 {
-    return (long) /* FIXME MIGRATION: double-check if you use the returned value of SDL_RWread() */
-        SDL_ReadIO((SDL_IOStream *) io->userdata, buf, buflen);
+    SDL_IOStream *stream = (SDL_IOStream *) io->userdata;
+    const size_t br = SDL_ReadIO(stream, buf, buflen);
+    if ((br == 0) && (SDL_GetIOStatus(stream) != SDL_IO_STATUS_EOF)) {
+        return -1;
+    }
+    return (long) br;
 }
 
 static long DirkSimple_rwops_streamlen(DirkSimple_Io *io)
 {
-    SDL_IOStream *rwops = (SDL_IOStream *) io->userdata;
-    const Sint64 origpos = SDL_TellIO(rwops);
-    const long retval = (long) SDL_SeekIO(rwops, 0, SDL_IO_SEEK_END);
-    SDL_SeekIO(rwops, origpos, SDL_IO_SEEK_SET);
-    return retval;
+    return (long) SDL_GetIOSize((SDL_IOStream *) io->userdata);
 }
 
 static int DirkSimple_rwops_seek(DirkSimple_Io *io, long absolute_offset)

Original file line number	Diff line number	Diff line change
`@@ -75,17 +75,17 @@ void DirkSimple_writelog(const char *str)`
`75`	`75`
`76`	`76`	`static long DirkSimple_rwops_read(DirkSimple_Io io, void buf, long buflen)`
`77`	`77`	`{`
`78`		`- return (long) /* FIXME MIGRATION: double-check if you use the returned value of SDL_RWread() */`
`79`		`- SDL_ReadIO((SDL_IOStream *) io->userdata, buf, buflen);`
	`78`	`+ SDL_IOStream stream = (SDL_IOStream ) io->userdata;`
	`79`	`+ const size_t br = SDL_ReadIO(stream, buf, buflen);`
	`80`	`+ if ((br == 0) && (SDL_GetIOStatus(stream) != SDL_IO_STATUS_EOF)) {`
	`81`	`+ return -1;`
	`82`	`+ }`
	`83`	`+ return (long) br;`
`80`	`84`	`}`
`81`	`85`
`82`	`86`	`static long DirkSimple_rwops_streamlen(DirkSimple_Io *io)`
`83`	`87`	`{`
`84`		`- SDL_IOStream rwops = (SDL_IOStream ) io->userdata;`
`85`		`- const Sint64 origpos = SDL_TellIO(rwops);`
`86`		`- const long retval = (long) SDL_SeekIO(rwops, 0, SDL_IO_SEEK_END);`
`87`		`- SDL_SeekIO(rwops, origpos, SDL_IO_SEEK_SET);`
`88`		`- return retval;`
	`88`	`+ return (long) SDL_GetIOSize((SDL_IOStream *) io->userdata);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`static int DirkSimple_rwops_seek(DirkSimple_Io *io, long absolute_offset)`