# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1558654065 -10800
# Node ID 5f8f170f8774eac30934986de66d6c6a18773ece
# Parent  8962901faf5da7390d8f12f4b29d6ec74bdc9255
Change dmC64GetOpMemBlock() function API.

diff -r 8962901faf5d -r 5f8f170f8774 tools/gfxconv.c
--- a/tools/gfxconv.c	Wed May 08 13:57:34 2019 +0300
+++ b/tools/gfxconv.c	Fri May 24 02:27:45 2019 +0300
@@ -1269,8 +1269,8 @@
             case DO_SET_MEM_HI:
             case DO_SET_MEM_LO:
             case DO_SET_OP:
-                dmC64GetOpMemBlock(src, op->subject, op->bank, (const DMC64MemBlock **) &srcBlk);
-                dmC64GetOpMemBlock(dst, op->subject, op->bank, (const DMC64MemBlock **) &dstBlk);
+                srcBlk = (DMC64MemBlock *) dmC64GetOpMemBlock(src, op->subject, op->bank);
+                dstBlk = (DMC64MemBlock *) dmC64GetOpMemBlock(dst, op->subject, op->bank);
                 blkname = dmC64GetOpSubjectName(op->subject);
 
                 // Skip if we did previous fixups/upconverts
diff -r 8962901faf5d -r 5f8f170f8774 tools/lib64gfx.c
--- a/tools/lib64gfx.c	Wed May 08 13:57:34 2019 +0300
+++ b/tools/lib64gfx.c	Fri May 24 02:27:45 2019 +0300
@@ -868,21 +868,21 @@
 }
 
 
-void dmC64GetOpMemBlock(const DMC64Image *img, const int subject, const int bank, const DMC64MemBlock **blk)
+const DMC64MemBlock * dmC64GetOpMemBlock(const DMC64Image *img, const int subject, const int bank)
 {
-    *blk = NULL;
-
     if (bank >= 0 && bank < img->nbanks)
     {
         switch (subject)
         {
-            case DS_COLOR_RAM  : *blk = &img->color[bank]; break;
-            case DS_SCREEN_RAM : *blk = &img->screen[bank]; break;
-            case DS_BITMAP_RAM : *blk = &img->bitmap[bank]; break;
-            case DS_CHAR_DATA  : *blk = &img->charData[bank]; break;
-            case DS_EXTRA_DATA : *blk = &img->extraData[bank]; break;
+            case DS_COLOR_RAM  : return &img->color[bank];
+            case DS_SCREEN_RAM : return &img->screen[bank];
+            case DS_BITMAP_RAM : return &img->bitmap[bank];
+            case DS_CHAR_DATA  : return &img->charData[bank];
+            case DS_EXTRA_DATA : return &img->extraData[bank];
         }
     }
+
+    return NULL;
 }
 
 
@@ -942,8 +942,8 @@
                     case DS_BITMAP_RAM:
                     case DS_CHAR_DATA:
                     case DS_EXTRA_DATA:
-                        // XXX BZZZT .. a nasty cast here --v
-                        dmC64GetOpMemBlock(img, op->subject, op->bank, (const DMC64MemBlock **) &blk);
+                        // XXX BZZZT .. a nasty cast here
+                        blk = (DMC64MemBlock *) dmC64GetOpMemBlock(img, op->subject, op->bank);
 
                         if ((dmC64MemBlockReAlloc(blk, op->offs2 + size)) != DMERR_OK)
                         {
@@ -1146,7 +1146,7 @@
                     case DS_BITMAP_RAM:
                     case DS_CHAR_DATA:
                     case DS_EXTRA_DATA:
-                        dmC64GetOpMemBlock(img, op->subject, op->bank, &blk);
+                        blk = dmC64GetOpMemBlock(img, op->subject, op->bank);
                         switch (op->type)
                         {
                             case DO_COPY:
diff -r 8962901faf5d -r 5f8f170f8774 tools/lib64gfx.h
--- a/tools/lib64gfx.h	Wed May 08 13:57:34 2019 +0300
+++ b/tools/lib64gfx.h	Fri May 24 02:27:45 2019 +0300
@@ -325,7 +325,7 @@
 int       dmC64ConvertCSDataToImage(DMImage *img, int xoffs, int yoffs, const Uint8 *inBuf, int width, int height, BOOL multicolor, int *colors);
 
 const char *dmC64GetOpSubjectName(const int subject);
-void      dmC64GetOpMemBlock(const DMC64Image *img, const int subject, const int bank, const DMC64MemBlock **blk);
+const DMC64MemBlock * dmC64GetOpMemBlock(const DMC64Image *img, const int subject, const int bank);
 int       dmC64SanityCheckEncDecOp(const int i, const DMC64EncDecOp *op, const DMC64Image *img);
 
 size_t    dmC64GetSubjectSize(const int subject, const DMC64ImageCommonFormat *fmt);