# HG changeset patch # User Matti Hamalainen # Date 1529590952 -10800 # Node ID 0b7062d874ef7d51771ad20acd3045dd9401cab2 # Parent cfe9807a1e6474524c1f0326ecf70405cc8890c3 Use dmMemset() instead of memset(). diff -r cfe9807a1e64 -r 0b7062d874ef src/dmgrowbuf.c --- a/src/dmgrowbuf.c Thu Jun 21 13:07:44 2018 +0300 +++ b/src/dmgrowbuf.c Thu Jun 21 17:22:32 2018 +0300 @@ -22,7 +22,7 @@ if (buf == NULL) return DMERR_NULLPTR; - memset(buf, 0, sizeof(DMGrowBuf)); + dmMemset(buf, 0, sizeof(DMGrowBuf)); return DMERR_OK; } @@ -68,7 +68,7 @@ return; dmFree(buf->data); - memset(buf, 0, sizeof(DMGrowBuf)); + dmMemset(buf, 0, sizeof(DMGrowBuf)); } } @@ -90,14 +90,14 @@ if ((dst->data = dmMalloc(dst->size)) == NULL) { // If that fails, clear the struct - memset(dst, 0, sizeof(DMGrowBuf)); + dmMemset(dst, 0, sizeof(DMGrowBuf)); return NULL; } // Copy data memcpy(dst->data, src->data, src->size); if (enlarge > 0) - memset(dst->data + src->size, 0, enlarge); + dmMemset(dst->data + src->size, 0, enlarge); // And reset some struct information dst->is_const = FALSE; @@ -183,9 +183,9 @@ if (clear) { if (buf->backwards) - memset(buf->data, 0, clrsize); + dmMemset(buf->data, 0, clrsize); else - memset(buf->data + buf->size, 0, clrsize); + dmMemset(buf->data + buf->size, 0, clrsize); } buf->size = nsize; diff -r cfe9807a1e64 -r 0b7062d874ef tools/lib64gfx.c --- a/tools/lib64gfx.c Thu Jun 21 13:07:44 2018 +0300 +++ b/tools/lib64gfx.c Thu Jun 21 17:22:32 2018 +0300 @@ -875,11 +875,11 @@ break; case DO_SET_MEM: - memset(blk->data, *src, size); + dmMemset(blk->data, *src, size); break; case DO_SET_OP: - memset(blk->data, op->offs, size); + dmMemset(blk->data, op->offs, size); break; default: @@ -1089,7 +1089,7 @@ break; case DO_SET_OP: - memset(dst, op->offs, size); + dmMemset(dst, op->offs, size); break; } break; diff -r cfe9807a1e64 -r 0b7062d874ef tools/libgfx.c --- a/tools/libgfx.c Thu Jun 21 13:07:44 2018 +0300 +++ b/tools/libgfx.c Thu Jun 21 17:22:32 2018 +0300 @@ -1333,7 +1333,7 @@ break; case 1: - memset(dp, 0, img->width); + dmMemset(dp, 0, img->width); for (int nplane = 0; nplane < hdr.nplanes; nplane++) {