Mercurial > hg > dmlib

comparison src/dmgrowbuf.c @ 1687:383ca5f6e78b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 01 Jun 2018 02:21:24 +0300
parents 064fc2e3ee64
children 9611ecd2c4fb
comparison
equal deleted inserted replaced
1686:dcc48679a89e 1687:383ca5f6e78b
16 16
17 17
18 int dmGrowBufInit(DMGrowBuf *buf) 18 int dmGrowBufInit(DMGrowBuf *buf)
19 { 19 {
20 DM_DBG("dmGrowBufInit(%p)\n", buf); 20 DM_DBG("dmGrowBufInit(%p)\n", buf);
21
21 if (buf == NULL) 22 if (buf == NULL)
22 return DMERR_NULLPTR; 23 return DMERR_NULLPTR;
23 24
24 memset(buf, 0, sizeof(DMGrowBuf)); 25 memset(buf, 0, sizeof(DMGrowBuf));
25 26
29 30
30 int dmGrowBufAlloc(DMGrowBuf *buf, const size_t initial, const size_t mingrow) 31 int dmGrowBufAlloc(DMGrowBuf *buf, const size_t initial, const size_t mingrow)
31 { 32 {
32 int res; 33 int res;
33 34
34 DM_DBG("dmGrowBufAlloc(%p, %" DM_PRIu_SIZE_T ", %" DM_PRIu_SIZE_T ")\n", buf, initial, mingrow); 35 DM_DBG("dmGrowBufAlloc(%p, %" DM_PRIu_SIZE_T ", %" DM_PRIu_SIZE_T ")\n",
36 buf, initial, mingrow);
37
35 if ((res = dmGrowBufInit(buf)) != DMERR_OK) 38 if ((res = dmGrowBufInit(buf)) != DMERR_OK)
36 return res; 39 return res;
37 40
38 buf->len = 0; 41 buf->len = 0;
39 buf->offs = 0; 42 buf->offs = 0;
53 { 56 {
54 int res; 57 int res;
55 if (pbuf == NULL) 58 if (pbuf == NULL)
56 return DMERR_NULLPTR; 59 return DMERR_NULLPTR;
57 60
58 DM_DBG("dmGrowBufNew(%p, %" DM_PRIu_SIZE_T ", %" DM_PRIu_SIZE_T ")\n", pbuf, initial, mingrow); 61 DM_DBG("dmGrowBufNew(%p, %" DM_PRIu_SIZE_T ", %" DM_PRIu_SIZE_T ")\n",
62 pbuf, initial, mingrow);
63
59 if ((*pbuf = dmMalloc0(sizeof(DMGrowBuf))) == NULL) 64 if ((*pbuf = dmMalloc0(sizeof(DMGrowBuf))) == NULL)
60 return DMERR_MALLOC; 65 return DMERR_MALLOC;
61 66
62 if ((res = dmGrowBufAlloc(*pbuf, initial, mingrow)) != DMERR_OK) 67 if ((res = dmGrowBufAlloc(*pbuf, initial, mingrow)) != DMERR_OK)
63 { 68 {
97 void dmGrowBufPush(DMGrowBuf *buf) 102 void dmGrowBufPush(DMGrowBuf *buf)
98 { 103 {
99 if (buf != NULL && buf->adata != NULL) 104 if (buf != NULL && buf->adata != NULL)
100 { 105 {
101 DM_DBG("dmGrowBufPush(%p): size=%" DM_PRIu_SIZE_T "\n" 106 DM_DBG("dmGrowBufPush(%p): size=%" DM_PRIu_SIZE_T "\n"
102 " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", buf, buf->size, buf->nstack, buf->offs, buf->len); 107 " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n",
108 buf, buf->size, buf->nstack, buf->offs, buf->len);
103 109
104 buf->stack[buf->nstack].offs = buf->offs; 110 buf->stack[buf->nstack].offs = buf->offs;
105 buf->stack[buf->nstack].len = buf->len; 111 buf->stack[buf->nstack].len = buf->len;
106 buf->nstack++; 112 buf->nstack++;
107 113
108 buf->offs = buf->len; 114 buf->offs = buf->len;
109 buf->data = buf->adata + buf->offs; 115 buf->data = buf->adata + buf->offs;
110 buf->len = 0; 116 buf->len = 0;
111 117
112 DM_DBG( 118 DM_DBG(
113 " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", buf->nstack, buf->offs, buf->len); 119 " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n",
120 buf->nstack, buf->offs, buf->len);
114 } 121 }
115 else 122 else
116 DM_DBG("dmGrowBufPush(%p)\n", buf); 123 DM_DBG("dmGrowBufPush(%p)\n", buf);
117 } 124 }
118 125
120 void dmGrowBufPop(DMGrowBuf *buf) 127 void dmGrowBufPop(DMGrowBuf *buf)
121 { 128 {
122 if (buf != NULL && buf->adata != NULL && buf->nstack > 0) 129 if (buf != NULL && buf->adata != NULL && buf->nstack > 0)
123 { 130 {
124 DM_DBG("dmGrowBufPop(%p): size=%" DM_PRIu_SIZE_T "\n" 131 DM_DBG("dmGrowBufPop(%p): size=%" DM_PRIu_SIZE_T "\n"
125 " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", buf, buf->size, buf->nstack, buf->offs, buf->len); 132 " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n",
133 buf, buf->size, buf->nstack, buf->offs, buf->len);
126 134
127 buf->nstack--; 135 buf->nstack--;
128 buf->offs = buf->stack[buf->nstack].offs; 136 buf->offs = buf->stack[buf->nstack].offs;
129 buf->len += buf->stack[buf->nstack].len; 137 buf->len += buf->stack[buf->nstack].len;
130 138
131 buf->data = buf->adata + buf->offs; 139 buf->data = buf->adata + buf->offs;
132 140
133 DM_DBG( 141 DM_DBG(
134 " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n", buf->nstack, buf->offs, buf->len); 142 " nstack=%d [offs=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T "]\n",
143 buf->nstack, buf->offs, buf->len);
135 144
136 } 145 }
137 else 146 else
138 DM_DBG("dmGrowBufPop(%p)\n", buf); 147 DM_DBG("dmGrowBufPop(%p)\n", buf);
139 } 148 }