From 5e2c2e0092d486619c20fdfdff8d511cd7270587 Mon Sep 17 00:00:00 2001
From: bjorn <tie.372@gmail.com>
Date: Sat, 25 Nov 2017 03:34:55 -0800
Subject: [PATCH] Use readBytes and writeBytes intead of read and write;

---
 src/filesystem/file.c       | 8 ++++----
 src/filesystem/file.h       | 4 ++--
 src/filesystem/filesystem.c | 4 ++--
 src/loaders/model.c         | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/filesystem/file.c b/src/filesystem/file.c
index c851f80f..667f004c 100644
--- a/src/filesystem/file.c
+++ b/src/filesystem/file.c
@@ -38,14 +38,14 @@ void lovrFileClose(File* file) {
   file->handle = NULL;
 }
 
-size_t lovrFileRead(File* file, void* data, size_t size, size_t count) {
+size_t lovrFileRead(File* file, void* data, size_t bytes) {
   lovrAssert(file->handle && file->mode == OPEN_READ, "File must be open for reading");
-  return PHYSFS_read(file->handle, data, size, count);
+  return PHYSFS_readBytes(file->handle, data, bytes);
 }
 
-size_t lovrFileWrite(File* file, void* data, size_t size, size_t count) {
+size_t lovrFileWrite(File* file, void* data, size_t bytes) {
   lovrAssert(file->handle && (file->mode == OPEN_READ || file->mode == OPEN_WRITE), "File must be open for writing");
-  return PHYSFS_write(file->handle, data, size, count);
+  return PHYSFS_writeBytes(file->handle, data, bytes);
 }
 
 size_t lovrFileGetSize(File* file) {
diff --git a/src/filesystem/file.h b/src/filesystem/file.h
index 44f86e5b..9cc1eea9 100644
--- a/src/filesystem/file.h
+++ b/src/filesystem/file.h
@@ -19,8 +19,8 @@ File* lovrFileCreate(const char* filename);
 void lovrFileDestroy(const Ref* ref);
 int lovrFileOpen(File* file, FileMode mode);
 void lovrFileClose(File* file);
-size_t lovrFileRead(File* file, void* data, size_t size, size_t count);
-size_t lovrFileWrite(File* file, void* data, size_t size, size_t count);
+size_t lovrFileRead(File* file, void* data, size_t bytes);
+size_t lovrFileWrite(File* file, void* data, size_t bytes);
 size_t lovrFileGetSize(File* file);
 int lovrFileSeek(File* file, size_t position);
 size_t lovrFileTell(File* file);
diff --git a/src/filesystem/filesystem.c b/src/filesystem/filesystem.c
index 504107d6..829e07e8 100644
--- a/src/filesystem/filesystem.c
+++ b/src/filesystem/filesystem.c
@@ -203,7 +203,7 @@ void* lovrFilesystemRead(const char* path, size_t* bytesRead) {
   }
 
   // Perform read
-  *bytesRead = lovrFileRead(file, data, 1, size);
+  *bytesRead = lovrFileRead(file, data, size);
   lovrFileClose(file);
 
   // Make sure we got everything
@@ -265,7 +265,7 @@ size_t lovrFilesystemWrite(const char* path, const char* content, size_t size, b
   }
 
   lovrFileOpen(file, append ? OPEN_APPEND : OPEN_WRITE);
-  size_t bytesWritten = lovrFileWrite(file, (void*) content, 1, size);
+  size_t bytesWritten = lovrFileWrite(file, (void*) content, size);
   lovrFileClose(file);
   lovrRelease(&file->ref);
   return bytesWritten;
diff --git a/src/loaders/model.c b/src/loaders/model.c
index 17e5a9a1..d36aae4b 100644
--- a/src/loaders/model.c
+++ b/src/loaders/model.c
@@ -116,7 +116,7 @@ static size_t assimpBlobTell(struct aiFile* assimpFile) {
 // File IO (for reading referenced materials/textures)
 static size_t assimpFileRead(struct aiFile* assimpFile, char* buffer, size_t size, size_t count) {
   File* file = (File*) assimpFile->UserData;
-  unsigned long bytes =  lovrFileRead(file, buffer, size, count);
+  unsigned long bytes = lovrFileRead(file, buffer, size * count);
   return bytes;
 }