# HG changeset patch # User Matti Hamalainen # Date 1353439585 -7200 # Node ID b2caef66452498fd55380cc6753414203649539f # Parent abbf089b119d4f4c1df0b6854372f7cab7c4deb0 Add new helper functions xs_fread_str() and xs_fread_byte(). diff -r abbf089b119d -r b2caef664524 src/xs_support.c --- a/src/xs_support.c Tue Nov 20 21:23:55 2012 +0200 +++ b/src/xs_support.c Tue Nov 20 21:26:25 2012 +0200 @@ -30,6 +30,21 @@ #include #endif + +gboolean xs_fread_str(XSFile *f, void *buf, const size_t len) +{ + return xs_fread(buf, len, 1, f) == 1; +} + + +gboolean xs_fread_byte(XSFile *f, guint8 *val) +{ + gint tmp = xs_fgetc(f); + *val = tmp; + return tmp != EOF; +} + + /* Error messages */ void xs_error(const char *fmt, ...) diff -r abbf089b119d -r b2caef664524 src/xs_support.h --- a/src/xs_support.h Tue Nov 20 21:23:55 2012 +0200 +++ b/src/xs_support.h Tue Nov 20 21:26:25 2012 +0200 @@ -128,6 +128,8 @@ guint16 xs_fread_be16(XSFile *); guint32 xs_fread_be32(XSFile *); +gboolean xs_fread_str(XSFile *, void *, const size_t); +gboolean xs_fread_byte(XSFile *, guint8 *); gboolean xs_fload_buffer(const gchar *filename, guint8 **pbuf, size_t *bufSize, const size_t maxSize, gboolean failMaxSize); gboolean xs_fload_buffer_path(const gchar *ppath, const gchar *pfilename,