AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-24 04:29:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

memio: make read_eof a MEMFILE property, remove printing

Browse Source
This commit is contained in:
Roman Fomin 2023-05-13 15:34:40 +07:00
parent 590d410b13
commit 0fe727bd82
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/memio.c
View File

@ -16,7 +16,6 @@
// memory. // memory.
// //
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -34,6 +33,7 @@ struct _MEMFILE {
size_t buflen; size_t buflen;
size_t alloced; size_t alloced;
unsigned int position; unsigned int position;
boolean read_eof;
boolean eof; boolean eof;
memfile_mode_t mode; memfile_mode_t mode;
}; };
@ -60,11 +60,9 @@ MEMFILE *mem_fopen_read(void *buf, size_t buflen)
size_t mem_fread(void *buf, size_t size, size_t nmemb, MEMFILE *stream) size_t mem_fread(void *buf, size_t size, size_t nmemb, MEMFILE *stream)
{ {
size_t items; size_t items;
static boolean read_eof;
if (stream->mode != MODE_READ) if (stream->mode != MODE_READ)
{ {
printf("not a read stream\n");
return -1; return -1;
} }
@ -73,7 +71,7 @@ size_t mem_fread(void *buf, size_t size, size_t nmemb, MEMFILE *stream)
return 0; return 0;
} }
if (read_eof) if (stream->read_eof)
{ {
stream->eof = true; stream->eof = true;
} }
@ -87,15 +85,7 @@ size_t mem_fread(void *buf, size_t size, size_t nmemb, MEMFILE *stream)
items = (stream->buflen - stream->position) / size; items = (stream->buflen - stream->position) / size;
} }
if (items > 0) stream->read_eof = (items > 0 ? false : true);
{
read_eof = false;
stream->eof = false;
}
else
{
read_eof = true;
}
// Copy bytes to buffer // Copy bytes to buffer
@ -270,12 +260,12 @@ int mem_fseek(MEMFILE *stream, signed long position, mem_rel_t whence)
if (newpos <= stream->buflen) if (newpos <= stream->buflen)
{ {
stream->position = newpos; stream->position = newpos;
stream->read_eof = false;
stream->eof = false; stream->eof = false;
return 0; return 0;
} }
else else
{ {
printf("Error seeking to %u\n", newpos);
return -1; return -1;
} }
} }