# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1425533855 -7200
# Node ID 848a88ce7a5752685440c3f67d7eba6eb4966f05
# Parent  f29fa5b6b7487a0aa0bdc872f422faf01f360d18
Use dmMemset().

diff -r f29fa5b6b748 -r 848a88ce7a57 minijss/jloadjss.c
--- a/minijss/jloadjss.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/minijss/jloadjss.c	Thu Mar 05 07:37:35 2015 +0200
@@ -4,7 +4,6 @@
  * (C) Copyright 2007-2015 Tecnic Software productions (TNSP)
  */
 #include "jssmod.h"
-#include <string.h>
 
 
 #ifdef JM_SUP_PATMODE_ALL
@@ -304,7 +303,7 @@
     *ppModule = NULL;
 
     // Check the JSSMOD header
-    memset(&jssH, 0, sizeof(jssH));
+    dmMemset(&jssH, 0, sizeof(jssH));
     JSGETBUF(&jssH, JSSMODHeader);
 
     if (memcmp(jssH.idMagic, "JM", 2) != 0)
@@ -359,7 +358,7 @@
         int result = DMERR_INVALID_DATA;
 
         // Get header and check size
-        memset(&jssP, 0, sizeof(jssP));
+        dmMemset(&jssP, 0, sizeof(jssP));
         JSGETBUF(&jssP, JSSMODPattern);
 
         // Allocate pattern
@@ -418,7 +417,7 @@
         JSSExtInstrument *einst;
         int i;
 
-        memset(&jssE, 0, sizeof(jssE));
+        dmMemset(&jssE, 0, sizeof(jssE));
         JSGETBUF(&jssE, JSSMODExtInstrument);
 
         if ((einst = jssAllocateExtInstrument()) == NULL)
@@ -453,7 +452,7 @@
         JSSMODInstrument jssI;
         JSSInstrument *inst;
 
-        memset(&jssI, 0, sizeof(jssI));
+        dmMemset(&jssI, 0, sizeof(jssI));
         JSGETBUF(&jssI, JSSMODInstrument);
 
         if ((inst = jssAllocateInstrument()) == NULL)
diff -r f29fa5b6b748 -r 848a88ce7a57 minijss/jloadxm.c
--- a/minijss/jloadxm.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/minijss/jloadxm.c	Thu Mar 05 07:37:35 2015 +0200
@@ -8,7 +8,6 @@
  *   (Not very useful, but if it's not too hard, then do it)
  */
 #include "jssmod.h"
-#include <string.h>
 
 
 /* XM value limit definitions
diff -r f29fa5b6b748 -r 848a88ce7a57 minijss/jssmix.c
--- a/minijss/jssmix.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/minijss/jssmix.c	Thu Mar 05 07:37:35 2015 +0200
@@ -4,7 +4,6 @@
  * (C) Copyright 2006-2015 Tecnic Software productions (TNSP)
  */
 #include "jssmix.h"
-#include <string.h>
 
 
 #ifdef DM_USE_C
@@ -179,7 +178,7 @@
 #endif
     dmFree(mixer->addBuffer);
 
-    memset(mixer, 0, sizeof(JSSMixer));
+    dmMemset(mixer, 0, sizeof(JSSMixer));
     dmFree(mixer);
 
     return DMERR_OK;
@@ -385,7 +384,7 @@
     assert(mixLength * mixer->outChannels <= mixer->addBufSize);
 
     // Clear mixer->addBuffer
-    memset(mixer->addBuffer, 0, mixLength * mixer->outChannels * sizeof(JMIXER_ADDBUF_TYPE));
+    dmMemset(mixer->addBuffer, 0, mixLength * mixer->outChannels * sizeof(JMIXER_ADDBUF_TYPE));
 
     ab = mixer->addBuffer;
     mixLeft = mixLength;
@@ -695,7 +694,7 @@
 void jvmClear(JSSMixer * mixer, const int channel)
 {
     JSS_LOCK(mixer);
-    memset(&mixer->channels[channel], 0, sizeof(JSSChannel));
+    dmMemset(&mixer->channels[channel], 0, sizeof(JSSChannel));
     JSS_UNLOCK(mixer);
 }
 
diff -r f29fa5b6b748 -r 848a88ce7a57 minijss/jssmod.c
--- a/minijss/jssmod.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/minijss/jssmod.c	Thu Mar 05 07:37:35 2015 +0200
@@ -4,7 +4,6 @@
  * (C) Copyright 2006-2015 Tecnic Software productions (TNSP)
  */
 #include "jssmod.h"
-#include <string.h>
 
 
 #ifndef JSS_LIGHT
@@ -363,7 +362,7 @@
 #endif
 
     // Free the module structure
-    memset(module, 0, sizeof(JSSModule));
+    dmMemset(module, 0, sizeof(JSSModule));
     dmFree(module);
 
     return DMERR_OK;
diff -r f29fa5b6b748 -r 848a88ce7a57 minijss/jssplr.c
--- a/minijss/jssplr.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/minijss/jssplr.c	Thu Mar 05 07:37:35 2015 +0200
@@ -267,7 +267,7 @@
 #endif
 
     // Clear structure
-    memset(mp, 0, sizeof(JSSPlayer));
+    dmMemset(mp, 0, sizeof(JSSPlayer));
     dmFree(mp);
 
     return DMERR_OK;
@@ -287,7 +287,7 @@
  */
 void jmpClearChannel(JSSPlayerChannel *chn)
 {
-    memset(chn, 0, sizeof(JSSPlayerChannel));
+    dmMemset(chn, 0, sizeof(JSSPlayerChannel));
 
     chn->note            = jsetNotSet;
     chn->ninstrument     = jsetNotSet;
diff -r f29fa5b6b748 -r 848a88ce7a57 src/dmengine.c
--- a/src/dmengine.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/src/dmengine.c	Thu Mar 05 07:37:35 2015 +0200
@@ -445,7 +445,7 @@
     // If paused, just render nothing
     if (engine->paused)
     {
-        memset(stream, 0, len);
+        dmMemset(stream, 0, len);
     }
     else
     // Otherwise, render audio
diff -r f29fa5b6b748 -r 848a88ce7a57 src/dmeval.c
--- a/src/dmeval.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/src/dmeval.c	Thu Mar 05 07:37:35 2015 +0200
@@ -143,7 +143,7 @@
     symbol = &(ev->symbols[ev->nsymbols]);
     ev->nsymbols++;
 
-    memset(symbol, 0, sizeof(DMEvalSymbol));
+    dmMemset(symbol, 0, sizeof(DMEvalSymbol));
     symbol->name = dm_strdup(name);
     symbol->type = type;
 
diff -r f29fa5b6b748 -r 848a88ce7a57 src/dmfft.c
--- a/src/dmfft.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/src/dmfft.c	Thu Mar 05 07:37:35 2015 +0200
@@ -66,7 +66,7 @@
     {
         dmFree(ctx->breversed);
         dmFree(ctx->sinTable);
-        memset(ctx, 0, sizeof(DMFFTContext));
+        dmMemset(ctx, 0, sizeof(DMFFTContext));
     }
 }
 
diff -r f29fa5b6b748 -r 848a88ce7a57 src/dmpack.c
--- a/src/dmpack.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/src/dmpack.c	Thu Mar 05 07:37:35 2015 +0200
@@ -215,7 +215,7 @@
     dmFree(pack->filename);
 
     // Free packfile
-    memset(pack, 0, sizeof(DMPackFile));
+    dmMemset(pack, 0, sizeof(DMPackFile));
     dmFree(pack);
 
     return DMERR_OK;
diff -r f29fa5b6b748 -r 848a88ce7a57 src/dmperlin.c
--- a/src/dmperlin.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/src/dmperlin.c	Thu Mar 05 07:37:35 2015 +0200
@@ -75,7 +75,7 @@
     if (ctx == NULL)
         return DMERR_NULLPTR;
 
-    memset(ctx, 0, sizeof(*ctx));
+    dmMemset(ctx, 0, sizeof(*ctx));
 
     if (seed < 0)
         return DMERR_INVALID_ARGS;
diff -r f29fa5b6b748 -r 848a88ce7a57 src/dmres.c
--- a/src/dmres.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/src/dmres.c	Thu Mar 05 07:37:35 2015 +0200
@@ -363,7 +363,7 @@
     }
 
     // Initialize decompression
-    memset(&zstr, 0, sizeof(zstr));
+    dmMemset(&zstr, 0, sizeof(zstr));
     zstr.next_out = handle->rawData;
     zstr.avail_out = handle->rawSize;
     cdataLeft = node->length;
diff -r f29fa5b6b748 -r 848a88ce7a57 src/dmsimple.c
--- a/src/dmsimple.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/src/dmsimple.c	Thu Mar 05 07:37:35 2015 +0200
@@ -604,7 +604,7 @@
     int err;
     BOOL initSDL = FALSE;
 
-    memset(&engine, 0, sizeof(engine));
+    dmMemset(&engine, 0, sizeof(engine));
 
     // Pre-initialization
     if ((err = demoPreInit(&engine)) != DMERR_OK)
diff -r f29fa5b6b748 -r 848a88ce7a57 src/dmvecmat.c
--- a/src/dmvecmat.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/src/dmvecmat.c	Thu Mar 05 07:37:35 2015 +0200
@@ -218,7 +218,7 @@
  */
 void dm_matrix_unit(DMMatrix *mat)
 {
-    memset(mat, 0, sizeof(DMMatrix));
+    dmMemset(mat, 0, sizeof(DMMatrix));
     mat->m[0][0] = 1.0f;
     mat->m[1][1] = 1.0f;
     mat->m[2][2] = 1.0f;
diff -r f29fa5b6b748 -r 848a88ce7a57 src/dmzlib.c
--- a/src/dmzlib.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/src/dmzlib.c	Thu Mar 05 07:37:35 2015 +0200
@@ -92,8 +92,8 @@
     int i, k = 0;
     int code, nextCode[16], sizes[17];
 
-    memset(sizes, 0, sizeof(sizes));
-    memset(ctx->fast, 0, sizeof(ctx->fast));
+    dmMemset(sizes, 0, sizeof(sizes));
+    dmMemset(ctx->fast, 0, sizeof(ctx->fast));
 
     for (i = 0; i < num; i++)
         sizes[sizelist[i]]++;
@@ -407,7 +407,7 @@
 
     // Get lengths table (uninitialized entries should be set to 0)
     codeLengths[256] = 0;
-    memset(codeLengthSizes, 0, sizeof(codeLengthSizes));
+    dmMemset(codeLengthSizes, 0, sizeof(codeLengthSizes));
     for (i = 0; i < hclen; i++)
     {
         int s = dmZReceive(ctx, 3);
@@ -442,20 +442,20 @@
                 return dmErrorDBG(DMERR_INVALID_DATA,
                     "Invalid bit length repeat.\n");
             }
-            memset(codeLengths + n, codeLengths[n - 1], bv);
+            dmMemset(codeLengths + n, codeLengths[n - 1], bv);
             n += bv;
         }
         else
         if (c == 17)
         {
             int bv = dmZReceive(ctx, 3) + 3;
-            memset(codeLengths + n, 0, bv);
+            dmMemset(codeLengths + n, 0, bv);
             n += bv;
         }
         else
         {
             int bv = dmZReceive(ctx, 7) + 11;
-            memset(codeLengths + n, 0, bv);
+            dmMemset(codeLengths + n, 0, bv);
             n += bv;
         }
     }
@@ -554,7 +554,7 @@
     if (ctx == NULL)
         return DMERR_NULLPTR;
 
-    memset(ctx, 0, sizeof(DMZLibContext));
+    dmMemset(ctx, 0, sizeof(DMZLibContext));
     return DMERR_OK;
 }
 
@@ -563,7 +563,7 @@
 {
     if (ctx != NULL)
     {
-        memset(ctx, 0, sizeof(DMZLibContext));
+        dmMemset(ctx, 0, sizeof(DMZLibContext));
     }
 }
 
diff -r f29fa5b6b748 -r 848a88ce7a57 src/libgfx.c
--- a/src/libgfx.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/src/libgfx.c	Thu Mar 05 07:37:35 2015 +0200
@@ -445,7 +445,7 @@
             goto error;
         }
 
-        memset(palette, 0, PNG_MAX_PALETTE_LENGTH * sizeof(png_color));
+        dmMemset(palette, 0, PNG_MAX_PALETTE_LENGTH * sizeof(png_color));
 
         for (i = 0; i < img->ncolors; i++)
         {
@@ -811,7 +811,7 @@
     pcx.fp     = fp;
 
     // Create PCX header
-    memset(&hdr, 0, sizeof(hdr));
+    dmMemset(&hdr, 0, sizeof(hdr));
     if (spec->paletted)
     {
         int i;
@@ -1379,7 +1379,7 @@
         const int nplanes = iff->bmhd.nplanes;
         Uint8 *dp = img->data + (yc * img->pitch);
 
-        memset(dp, 0, img->pitch);
+        dmMemset(dp, 0, img->pitch);
 
         for (plane = 0; plane < nplanes; plane++)
         {
@@ -1471,7 +1471,7 @@
     BOOL parsed = FALSE;
     int i, res = DMERR_OK;
 
-    memset(&iff, 0, sizeof(iff));
+    dmMemset(&iff, 0, sizeof(iff));
 
     // Read IFF FORM header
     if (!dmReadIFFChunk(fp, &chunk) ||
diff -r f29fa5b6b748 -r 848a88ce7a57 tools/auval.c
--- a/tools/auval.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/tools/auval.c	Thu Mar 05 07:37:35 2015 +0200
@@ -595,7 +595,7 @@
             data->pos += len;
         }
         else
-            memset(buf, 0, len);
+            dmMemset(buf, 0, len);
     }
         
     dmMutexUnlock(data->mutex);
@@ -617,7 +617,7 @@
     BOOL initSDL = FALSE, initTTF = FALSE, exitFlag,
          insertMode, audioPlaying = FALSE, jazzMode;
 
-    memset(&audata, 0, sizeof(audata));
+    dmMemset(&audata, 0, sizeof(audata));
 
     /* Parse arguments */
     if (!dmArgsProcess(argc, argv, optList, optListN,
diff -r f29fa5b6b748 -r 848a88ce7a57 tools/gfxconv.c
--- a/tools/gfxconv.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/tools/gfxconv.c	Thu Mar 05 07:37:35 2015 +0200
@@ -1405,7 +1405,7 @@
 
         while (!feof(inFile) && !error && (optItemCount < 0 || itemCount < optItemCount))
         {
-            memset(bufData, 0, bufSize);
+            dmMemset(bufData, 0, bufSize);
 
             if (fread(bufData, 1, bufSize, inFile) != bufSize)
             {
@@ -1475,7 +1475,7 @@
         
         while (!feof(inFile) && (optItemCount < 0 || itemCount < optItemCount))
         {
-            memset(bufData, 0, bufSize);
+            dmMemset(bufData, 0, bufSize);
 
             if (fread(bufData, 1, bufSize, inFile) != bufSize)
             {
diff -r f29fa5b6b748 -r 848a88ce7a57 tools/lib64gfx.c
--- a/tools/lib64gfx.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/tools/lib64gfx.c	Thu Mar 05 07:37:35 2015 +0200
@@ -60,7 +60,7 @@
             dmFree(img->screen[i]);
             dmFree(img->charmem[i]);
         }
-        memset(img, 0, sizeof(DMC64Image));
+        dmMemset(img, 0, sizeof(DMC64Image));
         dmFree(img);
     }
 }
@@ -1037,7 +1037,7 @@
     if (dst->width < src->width || dst->height < src->height)
         return DMERR_INVALID_DATA;
 
-    memset(dst->data, 0, dst->size);
+    dmMemset(dst->data, 0, dst->size);
 
     // Perform conversion
     for (yc = 0; yc < src->height; yc++)
diff -r f29fa5b6b748 -r 848a88ce7a57 tools/objlink.c
--- a/tools/objlink.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/tools/objlink.c	Thu Mar 05 07:37:35 2015 +0200
@@ -797,7 +797,7 @@
     if (optInitValueType == 1 || optInitValue <= 0xff)
     {
         dmPrint(1, "BYTE 0x%.2x\n", optInitValue);
-        memset(memory, optInitValue, memModel->size);
+        dmMemset(memory, optInitValue, memModel->size);
     }
     else
     if (optInitValueType == 2 || optInitValue <= 0xffff)
diff -r f29fa5b6b748 -r 848a88ce7a57 tools/packed.c
--- a/tools/packed.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/tools/packed.c	Thu Mar 05 07:37:35 2015 +0200
@@ -317,7 +317,7 @@
     if (compress)
     {
         int zret;
-        memset(&zstr, 0, sizeof(zstr));
+        dmMemset(&zstr, 0, sizeof(zstr));
         if (deflateInit(&zstr, level) != Z_OK)
         {
             ret = DMERR_COMPRESSION;
@@ -434,7 +434,7 @@
     // Read and uncompress the data, if needed
     if (decompress || (entry->flags & DMF_COMPRESSED) == 0)
     {
-        memset(&zstr, 0, sizeof(zstr));
+        dmMemset(&zstr, 0, sizeof(zstr));
         if (inflateInit(&zstr) != Z_OK)
         {
             ret = DMERR_COMPRESSION;
diff -r f29fa5b6b748 -r 848a88ce7a57 tools/ppl.c
--- a/tools/ppl.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/tools/ppl.c	Thu Mar 05 07:37:35 2015 +0200
@@ -555,7 +555,7 @@
     int result = -1;
     BOOL muteState = FALSE;
 
-    memset(&engine, 0, sizeof(engine));
+    dmMemset(&engine, 0, sizeof(engine));
 
     engine.optScrWidth = 640;
     engine.optScrHeight = 480;
diff -r f29fa5b6b748 -r 848a88ce7a57 tools/xm2jss.c
--- a/tools/xm2jss.c	Thu Mar 05 07:36:51 2015 +0200
+++ b/tools/xm2jss.c	Thu Mar 05 07:37:35 2015 +0200
@@ -539,7 +539,7 @@
         JSSMODExtInstrument jssE;
         JSSExtInstrument *einst = m->extInstruments[instr];
         
-        memset(&jssE, 0, sizeof(jssE));
+        dmMemset(&jssE, 0, sizeof(jssE));
 
         if (einst)
         {
@@ -575,7 +575,7 @@
         JSSMODInstrument jssI;
         JSSInstrument *inst = m->instruments[instr];
 
-        memset(&jssI, 0, sizeof(jssI));
+        dmMemset(&jssI, 0, sizeof(jssI));
 
         // Create header
         if (inst != NULL)