# HG changeset patch # User Matti Hamalainen # Date 1527808884 -10800 # Node ID 383ca5f6e78b52a3072512c00d1d0351402234e7 # Parent dcc48679a89ed90f0db39431fe8140527cb7793b Cosmetics. diff -r dcc48679a89e -r 383ca5f6e78b src/dmgrowbuf.c --- a/src/dmgrowbuf.c Thu May 31 18:19:03 2018 +0300 +++ b/src/dmgrowbuf.c Fri Jun 01 02:21:24 2018 +0300 @@ -18,6 +18,7 @@ int dmGrowBufInit(DMGrowBuf *buf) { DM_DBG("dmGrowBufInit(%p)\n", buf); + if (buf == NULL) return DMERR_NULLPTR; @@ -31,7 +32,9 @@ { int res; - DM_DBG("dmGrowBufAlloc(%p, %" DM_PRIu_SIZE_T ", %" DM_PRIu_SIZE_T ")\n", buf, initial, mingrow); + DM_DBG("dmGrowBufAlloc(%p, %" DM_PRIu_SIZE_T ", %" DM_PRIu_SIZE_T ")\n", + buf, initial, mingrow); + if ((res = dmGrowBufInit(buf)) != DMERR_OK) return res; @@ -55,7 +58,9 @@ if (pbuf == NULL) return DMERR_NULLPTR; - DM_DBG("dmGrowBufNew(%p, %" DM_PRIu_SIZE_T ", %" DM_PRIu_SIZE_T ")\n", pbuf, initial, mingrow); + DM_DBG("dmGrowBufNew(%p, %" DM_PRIu_SIZE_T ", %" DM_PRIu_SIZE_T ")\n", + pbuf, initial, mingrow); + if ((*pbuf = dmMalloc0(sizeof(DMGrowBuf))) == NULL) return DMERR_MALLOC; @@ -99,7 +104,8 @@ if (buf != NULL && buf->adata != NULL) { DM_DBG("dmGrowBufPush(%p): size=%" DM_PRIu_SIZE_T "\n" - " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", buf, buf->size, buf->nstack, buf->offs, buf->len); + " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", + buf, buf->size, buf->nstack, buf->offs, buf->len); buf->stack[buf->nstack].offs = buf->offs; buf->stack[buf->nstack].len = buf->len; @@ -110,7 +116,8 @@ buf->len = 0; DM_DBG( - " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", buf->nstack, buf->offs, buf->len); + " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", + buf->nstack, buf->offs, buf->len); } else DM_DBG("dmGrowBufPush(%p)\n", buf); @@ -122,7 +129,8 @@ if (buf != NULL && buf->adata != NULL && buf->nstack > 0) { DM_DBG("dmGrowBufPop(%p): size=%" DM_PRIu_SIZE_T "\n" - " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", buf, buf->size, buf->nstack, buf->offs, buf->len); + " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", + buf, buf->size, buf->nstack, buf->offs, buf->len); buf->nstack--; buf->offs = buf->stack[buf->nstack].offs; @@ -131,7 +139,8 @@ buf->data = buf->adata + buf->offs; DM_DBG( - " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", buf->nstack, buf->offs, buf->len); + " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", + buf->nstack, buf->offs, buf->len); } else diff -r dcc48679a89e -r 383ca5f6e78b src/dmgrowbuf.h --- a/src/dmgrowbuf.h Thu May 31 18:19:03 2018 +0300 +++ b/src/dmgrowbuf.h Fri Jun 01 02:21:24 2018 +0300 @@ -13,6 +13,7 @@ extern "C" { #endif + typedef struct { Uint8 *data, *adata; @@ -28,6 +29,10 @@ int dmGrowBufAlloc(DMGrowBuf *buf, const size_t initial, const size_t mingrow); int dmGrowBufNew(DMGrowBuf **pbuf, const size_t initial, const size_t mingrow); void dmGrowBufFree(DMGrowBuf *buf); + +void dmGrowBufPush(DMGrowBuf *buf); +void dmGrowBufPop(DMGrowBuf *buf); + BOOL dmGrowBufGrow(DMGrowBuf *buf, const size_t amount); BOOL dmGrowBufCheckGrow(DMGrowBuf *buf, const size_t nsize); int dmGrowBufResize(DMGrowBuf *buf); @@ -40,9 +45,6 @@ BOOL dmGrowBufPutU32BE(DMGrowBuf *buf, const Uint32 val); BOOL dmGrowBufPutU32LE(DMGrowBuf *buf, const Uint32 val); -void dmGrowBufPush(DMGrowBuf *buf); -void dmGrowBufPop(DMGrowBuf *buf); - #ifdef __cplusplus }