Mercurial > hg > dmlib
changeset 445:1d65efb29986
Simplify.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 04 Nov 2012 06:54:37 +0200 |
parents | 7d588807f91d |
children | a6d0e101cd16 |
files | libgfx.c |
diffstat | 1 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libgfx.c Sun Nov 04 06:52:42 2012 +0200 +++ b/libgfx.c Sun Nov 04 06:54:37 2012 +0200 @@ -940,6 +940,7 @@ Uint32 id; Uint32 size; int count; + char str[6]; } DMIFFChunk; @@ -980,14 +981,14 @@ return TRUE; } -static char * dmGetIFFChunkID(const DMIFFChunk *chunk, char *buf) +static char * dmGetIFFChunkID(DMIFFChunk *chunk) { - buf[0] = (chunk->id >> 24) & 0xff; - buf[1] = (chunk->id >> 16) & 0xff; - buf[2] = (chunk->id >> 8) & 0xff; - buf[3] = (chunk->id) & 0xff; - buf[4] = 0; - return buf; + chunk->str[0] = (chunk->id >> 24) & 0xff; + chunk->str[1] = (chunk->id >> 16) & 0xff; + chunk->str[2] = (chunk->id >> 8) & 0xff; + chunk->str[3] = (chunk->id) & 0xff; + chunk->str[4] = 0; + return chunk->str; } static BOOL dmSkipIFFChunkRest(FILE *fp, const DMIFFChunk *chunk, const Uint32 used) @@ -998,13 +999,13 @@ return TRUE; } -static BOOL dmCheckIFFChunk(DMIFFChunk *dest, const DMIFFChunk *chunk, const BOOL multi, const Uint32 minSize) +static BOOL dmCheckIFFChunk(DMIFFChunk *dest, DMIFFChunk *chunk, + const BOOL multi, const Uint32 minSize) { if (dest->count > 0 && !multi) { - char buf[6]; dmError("ILBM: Multiple instances of chunk %s found.\n", - dmGetIFFChunkID(chunk, buf)); + dmGetIFFChunkID(chunk)); return FALSE; } @@ -1160,9 +1161,8 @@ default: { - char buf[6]; dmMsg(3, "Unknown chunk ID '%s', size %d\n", - dmGetIFFChunkID(&chunk, buf), chunk.size); + dmGetIFFChunkID(&chunk), chunk.size); if (fseeko(fp, chunk.size, SEEK_CUR) != 0) {