Mercurial > hg > dmlib
diff tools/gfxconv.c @ 1852:219417325036
Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and
dmC64GetOpSubjectName() functions for some flexibility.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 22 Jun 2018 23:40:20 +0300 |
| parents | bda7f82f221e |
| children | f382cde6bb58 |
line wrap: on
line diff
--- a/tools/gfxconv.c Fri Jun 22 23:11:58 2018 +0300 +++ b/tools/gfxconv.c Fri Jun 22 23:40:20 2018 +0300 @@ -1014,7 +1014,7 @@ { const DMC64EncDecOp *op = fmtGetEncDecOp(dstFmt, i); DMC64MemBlock *srcBlk = NULL, *dstBlk = NULL; - char *blkname = NULL; + const char *blkname = NULL; size_t size; if (op->type == DO_LAST) @@ -1028,8 +1028,9 @@ case DO_SET_MEM_HI: case DO_SET_MEM_LO: case DO_SET_OP: - dmC64GetOpMemBlockAndName(src, op->subject, op->bank, (const DMC64MemBlock **) &srcBlk, &blkname); - dmC64GetOpMemBlockAndName(dst, op->subject, op->bank, (const DMC64MemBlock **) &dstBlk, &blkname); + dmC64GetOpMemBlock(src, op->subject, op->bank, (const DMC64MemBlock **) &srcBlk); + dmC64GetOpMemBlock(dst, op->subject, op->bank, (const DMC64MemBlock **) &dstBlk); + blkname = dmC64GetOpSubjectName(op->subject); // Skip if we did previous fixups/upconverts if (dstBlk != NULL && dstBlk->data != NULL)