mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-06 15:48:51 +00:00
Go to a File based approach over Handle based
This commit is contained in:
@@ -2,8 +2,8 @@ package os2
|
||||
|
||||
import "core:io"
|
||||
|
||||
file_to_stream :: proc(fd: Handle) -> (s: io.Stream) {
|
||||
s.stream_data = rawptr(uintptr(fd))
|
||||
file_to_stream :: proc(f: ^File) -> (s: io.Stream) {
|
||||
s.stream_data = f
|
||||
s.stream_vtable = _file_stream_vtable
|
||||
return
|
||||
}
|
||||
@@ -20,66 +20,66 @@ error_to_io_error :: proc(ferr: Error) -> io.Error {
|
||||
@(private)
|
||||
_file_stream_vtable := &io.Stream_VTable{
|
||||
impl_read = proc(s: io.Stream, p: []byte) -> (n: int, err: io.Error) {
|
||||
fd := Handle(uintptr(s.stream_data))
|
||||
f := (^File)(s.stream_data)
|
||||
ferr: Error
|
||||
n, ferr = read(fd, p)
|
||||
n, ferr = read(f, p)
|
||||
err = error_to_io_error(ferr)
|
||||
return
|
||||
},
|
||||
impl_read_at = proc(s: io.Stream, p: []byte, offset: i64) -> (n: int, err: io.Error) {
|
||||
fd := Handle(uintptr(s.stream_data))
|
||||
f := (^File)(s.stream_data)
|
||||
ferr: Error
|
||||
n, ferr = read_at(fd, p, offset)
|
||||
n, ferr = read_at(f, p, offset)
|
||||
err = error_to_io_error(ferr)
|
||||
return
|
||||
},
|
||||
impl_write_to = proc(s: io.Stream, w: io.Writer) -> (n: i64, err: io.Error) {
|
||||
fd := Handle(uintptr(s.stream_data))
|
||||
f := (^File)(s.stream_data)
|
||||
ferr: Error
|
||||
n, ferr = write_to(fd, w)
|
||||
n, ferr = write_to(f, w)
|
||||
err = error_to_io_error(ferr)
|
||||
return
|
||||
},
|
||||
impl_write = proc(s: io.Stream, p: []byte) -> (n: int, err: io.Error) {
|
||||
fd := Handle(uintptr(s.stream_data))
|
||||
f := (^File)(s.stream_data)
|
||||
ferr: Error
|
||||
n, ferr = write(fd, p)
|
||||
n, ferr = write(f, p)
|
||||
err = error_to_io_error(ferr)
|
||||
return
|
||||
},
|
||||
impl_write_at = proc(s: io.Stream, p: []byte, offset: i64) -> (n: int, err: io.Error) {
|
||||
fd := Handle(uintptr(s.stream_data))
|
||||
f := (^File)(s.stream_data)
|
||||
ferr: Error
|
||||
n, ferr = write_at(fd, p, offset)
|
||||
n, ferr = write_at(f, p, offset)
|
||||
err = error_to_io_error(ferr)
|
||||
return
|
||||
},
|
||||
impl_read_from = proc(s: io.Stream, r: io.Reader) -> (n: i64, err: io.Error) {
|
||||
fd := Handle(uintptr(s.stream_data))
|
||||
f := (^File)(s.stream_data)
|
||||
ferr: Error
|
||||
n, ferr = read_from(fd, r)
|
||||
n, ferr = read_from(f, r)
|
||||
err = error_to_io_error(ferr)
|
||||
return
|
||||
},
|
||||
impl_seek = proc(s: io.Stream, offset: i64, whence: io.Seek_From) -> (i64, io.Error) {
|
||||
fd := Handle(uintptr(s.stream_data))
|
||||
n, ferr := seek(fd, offset, Seek_From(whence))
|
||||
f := (^File)(s.stream_data)
|
||||
n, ferr := seek(f, offset, Seek_From(whence))
|
||||
err := error_to_io_error(ferr)
|
||||
return n, err
|
||||
},
|
||||
impl_size = proc(s: io.Stream) -> i64 {
|
||||
fd := Handle(uintptr(s.stream_data))
|
||||
sz, _ := file_size(fd)
|
||||
f := (^File)(s.stream_data)
|
||||
sz, _ := file_size(f)
|
||||
return sz
|
||||
},
|
||||
impl_flush = proc(s: io.Stream) -> io.Error {
|
||||
fd := Handle(uintptr(s.stream_data))
|
||||
ferr := flush(fd)
|
||||
f := (^File)(s.stream_data)
|
||||
ferr := flush(f)
|
||||
return error_to_io_error(ferr)
|
||||
},
|
||||
impl_close = proc(s: io.Stream) -> io.Error {
|
||||
fd := Handle(uintptr(s.stream_data))
|
||||
ferr := close(fd)
|
||||
f := (^File)(s.stream_data)
|
||||
ferr := close(f)
|
||||
return error_to_io_error(ferr)
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user