Mercurial > hg > dmlib
changeset 1701:31a1f710e342
Fix DMGrowBuf debugging.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 05 Jun 2018 18:26:30 +0300 |
| parents | a2e65aa47554 |
| children | 94329f678841 |
| files | src/dmgrowbuf.c |
| diffstat | 1 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dmgrowbuf.c Tue Jun 05 15:04:15 2018 +0300 +++ b/src/dmgrowbuf.c Tue Jun 05 18:26:30 2018 +0300 @@ -86,7 +86,7 @@ { DM_DBG( " buf->data = %p\n" - " buf->allocated = %s\n", + " buf->allocated = %s\n" " buf->is_const = %s\n", buf->data, buf->allocated ? "YES" : "NO", @@ -105,15 +105,27 @@ DMGrowBuf * dmGrowBufConstCopy(DMGrowBuf *dst, const DMGrowBuf *src) { + if (dst == NULL) + return NULL; + + DM_DBG("dmGrowBufConstCopy(dst=%p, src=%p):\n" + " data=%p, size=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T ", offs=%" DM_PRIu_SIZE_T "\n", + dst, src, src->data, src->size, src->len, src->offs); + memcpy(dst, src, sizeof(DMGrowBuf)); dst->is_const = TRUE; + return dst; } DMGrowBuf * dmGrowBufCreateFrom(DMGrowBuf *dst, Uint8 *data, size_t len) { - dmGrowBufInit(dst); + if (dmGrowBufInit(dst) != DMERR_OK) + return NULL; + + DM_DBG("dmGrowBufCreateFrom(dst=%p, data=%p, len=%" DM_PRIu_SIZE_T ")\n", + dst, data, len); dst->data = data; dst->len = dst->size = len; @@ -126,9 +138,9 @@ static BOOL dmGrowBufRealloc(DMGrowBuf *buf, const size_t nsize, const BOOL clear) { DM_DBG("dmGrowBufRealloc(%p):\n" - " size=%" DM_PRIu_SIZE_T ", nsize=" DM_PRIu_SIZE_T - ", nstack=%d, offs=%" DM_PRIu_SIZE_T "\n", - buf, buf->size, nsize, buf->nstack, buf->offs); + " size=%" DM_PRIu_SIZE_T ", nsize=%" DM_PRIu_SIZE_T + ", offs=%" DM_PRIu_SIZE_T "\n", + buf, buf->size, nsize, buf->offs); if (buf->is_const) return FALSE;