Browse Source

Bridged a bugfix from os_windows to other os's.

Zachary Pierson 8 years ago
parent
commit
63345cd0d8
2 changed files with 8 additions and 8 deletions
  1. 4 4
      core/os_linux.odin
  2. 4 4
      core/os_x.odin

+ 4 - 4
core/os_linux.odin

@@ -83,7 +83,7 @@ close :: proc(fd: Handle) {
 write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 	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) {
 		return 0, 1;
 	}
@@ -93,7 +93,7 @@ write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 read :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 	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) {
 		return 0, 1;
 	}
@@ -147,8 +147,8 @@ read_entire_file :: proc(name: string) -> ([]byte, bool) {
 
 	// We have a file size!
 
-	data := new_slice(u8, size+1);
-	if data.data == nil {
+	data := make([]u8, size+1);
+	if data == nil {
 		fmt.println("Failed to allocate file buffer.");
 		return nil, false;
 	}

+ 4 - 4
core/os_x.odin

@@ -87,7 +87,7 @@ close :: proc(fd: Handle) {
 write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 	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) {
 		return 0, 1;
 	}
@@ -97,7 +97,7 @@ write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 read :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 	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) {
 		return 0, 1;
 	}
@@ -151,8 +151,8 @@ read_entire_file :: proc(name: string) -> ([]byte, bool) {
 
 	// We have a file size!
 
-	data := new_slice(u8, size+1);
-	if data.data == nil {
+	data := make([]u8, size+1);
+	if ^data[0] == nil {
 		fmt.println("Failed to allocate file buffer.");
 		return nil, false;
 	}