ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 23:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bridged a bugfix from os_windows to other os's.

Browse Source
This commit is contained in:
Zachary Pierson
2017-04-04 18:51:36 -05:00
parent e41d6261c2
commit 63345cd0d8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os_linux.odin
+4 -4
View File
@@ -83,7 +83,7 @@ close :: proc(fd: Handle) {
write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) { write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
assert(fd != -1); assert(fd != -1);
bytes_written := unix_write(fd, data.data, data.count); bytes_written := unix_write(fd, ^data[0], len(data));
if(bytes_written == -1) { if(bytes_written == -1) {
return 0, 1; return 0, 1;
} }
@@ -93,7 +93,7 @@ write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
read :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) { read :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
assert(fd != -1); assert(fd != -1);
bytes_read := unix_read(fd, data.data, data.count); bytes_read := unix_read(fd, ^data[0], len(data));
if(bytes_read == -1) { if(bytes_read == -1) {
return 0, 1; return 0, 1;
} }
@@ -147,8 +147,8 @@ read_entire_file :: proc(name: string) -> ([]byte, bool) {
// We have a file size! // We have a file size!
data := new_slice(u8, size+1); data := make([]u8, size+1);
if data.data == nil { if data == nil {
fmt.println("Failed to allocate file buffer."); fmt.println("Failed to allocate file buffer.");
return nil, false; return nil, false;
} }
core/os_x.odin
+4 -4
View File
@@ -87,7 +87,7 @@ close :: proc(fd: Handle) {
write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) { write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
assert(fd != -1); assert(fd != -1);
bytes_written := unix_write(fd, data.data, data.count); bytes_written := unix_write(fd, ^data[0], len(data));
if(bytes_written == -1) { if(bytes_written == -1) {
return 0, 1; return 0, 1;
} }
@@ -97,7 +97,7 @@ write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
read :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) { read :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
assert(fd != -1); assert(fd != -1);
bytes_read := unix_read(fd, data.data, data.count); bytes_read := unix_read(fd, ^data[0], len(data));
if(bytes_read == -1) { if(bytes_read == -1) {
return 0, 1; return 0, 1;
} }
@@ -151,8 +151,8 @@ read_entire_file :: proc(name: string) -> ([]byte, bool) {
// We have a file size! // We have a file size!
data := new_slice(u8, size+1); data := make([]u8, size+1);
if data.data == nil { if ^data[0] == nil {
fmt.println("Failed to allocate file buffer."); fmt.println("Failed to allocate file buffer.");
return nil, false; return nil, false;
} }