# HG changeset patch # User Matti Hamalainen # Date 1353677501 -7200 # Node ID b60220fd16690112581f0e83ed700cce0bd06e83 # Parent d4cee32e7050b1eedb70733ae15e35a4df140afd s/Uint8/void/ in dmf_{read,write}_str(). diff -r d4cee32e7050 -r b60220fd1669 dmres.c --- a/dmres.c Fri Nov 23 15:26:32 2012 +0200 +++ b/dmres.c Fri Nov 23 15:31:41 2012 +0200 @@ -1148,9 +1148,9 @@ /* Helper resource access routines */ -int dmf_read_str(DMResource *f, Uint8 *s, size_t l) +int dmf_read_str(DMResource *f, void *s, size_t l) { - return dmfread(s, sizeof(Uint8), l, f) == l; + return dmfread(s, 1, l, f) == l; } BOOL dmf_read_byte(DMResource *f, Uint8 *val) diff -r d4cee32e7050 -r b60220fd1669 dmres.h --- a/dmres.h Fri Nov 23 15:26:32 2012 +0200 +++ b/dmres.h Fri Nov 23 15:31:41 2012 +0200 @@ -169,7 +169,7 @@ // Helper functions for endianess based reading etc -int dmf_read_str(DMResource *, Uint8 *, size_t); +int dmf_read_str(DMResource *, void *, size_t); BOOL dmf_read_byte(DMResource *, Uint8 *); BOOL dmf_read_be16(DMResource *, Uint16 *); diff -r d4cee32e7050 -r b60220fd1669 dmresw.c --- a/dmresw.c Fri Nov 23 15:26:32 2012 +0200 +++ b/dmresw.c Fri Nov 23 15:31:41 2012 +0200 @@ -6,9 +6,9 @@ */ #include "dmresw.h" -int dmf_write_str(DMResource *f, Uint8 *s, size_t l) +int dmf_write_str(DMResource *f, void *s, size_t l) { - return dmfwrite(s, sizeof(Uint8), l, f) == l; + return dmfwrite(s, 1, l, f) == l; } diff -r d4cee32e7050 -r b60220fd1669 dmresw.h --- a/dmresw.h Fri Nov 23 15:26:32 2012 +0200 +++ b/dmresw.h Fri Nov 23 15:31:41 2012 +0200 @@ -13,7 +13,7 @@ extern "C" { #endif -int dmf_write_str(DMResource *, Uint8 *, size_t); +int dmf_write_str(DMResource *, void *, size_t); BOOL dmf_write_byte(DMResource *, const Uint8); BOOL dmf_write_be16(DMResource *, Uint16);