lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use readBytes and writeBytes intead of read and write;

This commit is contained in:
bjorn 2017-11-25 03:34:55 -08:00
parent b2a05612db
commit 5e2c2e0092
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/filesystem/file.c
View File

@ -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) {

4
src/filesystem/file.h
View File

@ -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);

4
src/filesystem/filesystem.c
View File

@ -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;

2
src/loaders/model.c
View File

@ -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;
}