# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1352004877 -7200
# Node ID 1d65efb29986f1bb16d3c23a942bca140e6594c8
# Parent  7d588807f91d0f62949c675d57ff51ba77b7bf61
Simplify.

diff -r 7d588807f91d -r 1d65efb29986 libgfx.c
--- 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)
                     {