mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-29 01:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expect stream as a field directly on os2.File

Browse Source
This commit is contained in:
gingerBill
2024-03-13 16:30:22 +00:00
parent 5f2496226f
commit 271f84ab5b
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/os/os2/file.odin
View File

@@ -6,6 +6,7 @@ import "base:runtime"
File :: struct {
impl: _File,
stream: io.Stream,
}
File_Mode :: distinct u32
@@ -72,56 +73,56 @@ name :: proc(f: ^File) -> string {
close :: proc(f: ^File) -> Error {
if f != nil {
return io.close(f.impl.stream)
return io.close(f.stream)
}
return nil
}
seek :: proc(f: ^File, offset: i64, whence: io.Seek_From) -> (ret: i64, err: Error) {
if f != nil {
return io.seek(f.impl.stream, offset, whence)
return io.seek(f.stream, offset, whence)
}
return 0, .Invalid_File
}
read :: proc(f: ^File, p: []byte) -> (n: int, err: Error) {
if f != nil {
return io.read(f.impl.stream, p)
return io.read(f.stream, p)
}
return 0, .Invalid_File
}
read_at :: proc(f: ^File, p: []byte, offset: i64) -> (n: int, err: Error) {
if f != nil {
return io.read_at(f.impl.stream, p, offset)
return io.read_at(f.stream, p, offset)
}
return 0, .Invalid_File
}
write :: proc(f: ^File, p: []byte) -> (n: int, err: Error) {
if f != nil {
return io.write(f.impl.stream, p)
return io.write(f.stream, p)
}
return 0, .Invalid_File
}
write_at :: proc(f: ^File, p: []byte, offset: i64) -> (n: int, err: Error) {
if f != nil {
return io.write_at(f.impl.stream, p, offset)
return io.write_at(f.stream, p, offset)
}
return 0, .Invalid_File
}
file_size :: proc(f: ^File) -> (n: i64, err: Error) {
if f != nil {
return io.size(f.impl.stream)
return io.size(f.stream)
}
return 0, .Invalid_File
}
flush :: proc(f: ^File) -> Error {
if f != nil {
return io.flush(f.impl.stream)
return io.flush(f.stream)
}
return nil
}

4
core/os/os2/file_linux.odin
View File

@@ -33,8 +33,6 @@ _File :: struct {
name: string,
fd: int,
allocator: runtime.Allocator,
stream: io.Stream,
}
_file_allocator :: proc() -> runtime.Allocator {
@@ -75,7 +73,7 @@ _new_file :: proc(fd: uintptr, _: string) -> ^File {
file.impl.fd = int(fd)
file.impl.allocator = _file_allocator()
file.impl.name = _get_full_path(file.impl.fd, file.impl.allocator)
file.impl.stream = {
file.stream = {
data = file,
procedure = _file_stream_proc,
}

4
core/os/os2/file_stream.odin
View File

@@ -4,8 +4,8 @@ import "core:io"
to_stream :: proc(f: ^File) -> (s: io.Stream) {
if f != nil {
assert(f.impl.stream.procedure != nil)
s = f.impl.stream
assert(f.stream.procedure != nil)
s = f.stream
}
return
}

4
core/os/os2/file_windows.odin
View File

@@ -73,8 +73,6 @@ _File :: struct {
wname: win32.wstring,
kind: _File_Kind,
stream: io.Stream,
allocator: runtime.Allocator,
rw_mutex: sync.RW_Mutex, // read write calls
@@ -181,7 +179,7 @@ _new_file :: proc(handle: uintptr, name: string) -> ^File {
}
f.impl.kind = kind
f.impl.stream = {
f.stream = {
data = f,
procedure = _file_stream_proc,
}