@@ -73,7 +73,7 @@ void DirkSimple_writelog(const char *str)
7373 SDL_Log ("%s" , str );
7474}
7575
76- static long DirkSimple_rwops_read (DirkSimple_Io * io , void * buf , long buflen )
76+ static long DirkSimple_sdliostream_read (DirkSimple_Io * io , void * buf , long buflen )
7777{
7878 SDL_IOStream * stream = (SDL_IOStream * ) io -> userdata ;
7979 const size_t br = SDL_ReadIO (stream , buf , buflen );
@@ -83,18 +83,18 @@ static long DirkSimple_rwops_read(DirkSimple_Io *io, void *buf, long buflen)
8383 return (long ) br ;
8484}
8585
86- static long DirkSimple_rwops_streamlen (DirkSimple_Io * io )
86+ static long DirkSimple_sdliostream_streamlen (DirkSimple_Io * io )
8787{
8888 return (long ) SDL_GetIOSize ((SDL_IOStream * ) io -> userdata );
8989}
9090
91- static int DirkSimple_rwops_seek (DirkSimple_Io * io , long absolute_offset )
91+ static int DirkSimple_sdliostream_seek (DirkSimple_Io * io , long absolute_offset )
9292{
9393 return SDL_SeekIO ((SDL_IOStream * ) io -> userdata , absolute_offset ,
9494 SDL_IO_SEEK_SET ) != -1 ;
9595}
9696
97- static void DirkSimple_rwops_close (DirkSimple_Io * io )
97+ static void DirkSimple_sdliostream_close (DirkSimple_Io * io )
9898{
9999 SDL_CloseIO ((SDL_IOStream * ) io -> userdata );
100100 DirkSimple_free (io );
@@ -103,14 +103,14 @@ static void DirkSimple_rwops_close(DirkSimple_Io *io)
103103DirkSimple_Io * DirkSimple_openfile_read (const char * path )
104104{
105105 DirkSimple_Io * io = NULL ;
106- SDL_IOStream * rwops = SDL_IOFromFile (path , "rb" );
107- if (rwops ) {
106+ SDL_IOStream * sdliostream = SDL_IOFromFile (path , "rb" );
107+ if (sdliostream ) {
108108 io = DirkSimple_xmalloc (sizeof (DirkSimple_Io ));
109- io -> read = DirkSimple_rwops_read ;
110- io -> streamlen = DirkSimple_rwops_streamlen ;
111- io -> seek = DirkSimple_rwops_seek ;
112- io -> close = DirkSimple_rwops_close ;
113- io -> userdata = rwops ;
109+ io -> read = DirkSimple_sdliostream_read ;
110+ io -> streamlen = DirkSimple_sdliostream_streamlen ;
111+ io -> seek = DirkSimple_sdliostream_seek ;
112+ io -> close = DirkSimple_sdliostream_close ;
113+ io -> userdata = sdliostream ;
114114 }
115115 return io ;
116116}
0 commit comments