Mercurial > hg > dmlib
comparison src/dmgrowbuf.c @ 1701:31a1f710e342
Fix DMGrowBuf debugging.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 05 Jun 2018 18:26:30 +0300 |
parents | a2e65aa47554 |
children | 94329f678841 |
comparison
equal
deleted
inserted
replaced
1700:a2e65aa47554 | 1701:31a1f710e342 |
---|---|
84 DM_DBG("dmGrowBufFree(%p)\n", buf); | 84 DM_DBG("dmGrowBufFree(%p)\n", buf); |
85 if (buf != NULL) | 85 if (buf != NULL) |
86 { | 86 { |
87 DM_DBG( | 87 DM_DBG( |
88 " buf->data = %p\n" | 88 " buf->data = %p\n" |
89 " buf->allocated = %s\n", | 89 " buf->allocated = %s\n" |
90 " buf->is_const = %s\n", | 90 " buf->is_const = %s\n", |
91 buf->data, | 91 buf->data, |
92 buf->allocated ? "YES" : "NO", | 92 buf->allocated ? "YES" : "NO", |
93 buf->is_const ? "YES" : "NO"); | 93 buf->is_const ? "YES" : "NO"); |
94 | 94 |
103 } | 103 } |
104 | 104 |
105 | 105 |
106 DMGrowBuf * dmGrowBufConstCopy(DMGrowBuf *dst, const DMGrowBuf *src) | 106 DMGrowBuf * dmGrowBufConstCopy(DMGrowBuf *dst, const DMGrowBuf *src) |
107 { | 107 { |
108 if (dst == NULL) | |
109 return NULL; | |
110 | |
111 DM_DBG("dmGrowBufConstCopy(dst=%p, src=%p):\n" | |
112 " data=%p, size=%" DM_PRIu_SIZE_T ", len=%" DM_PRIu_SIZE_T ", offs=%" DM_PRIu_SIZE_T "\n", | |
113 dst, src, src->data, src->size, src->len, src->offs); | |
114 | |
108 memcpy(dst, src, sizeof(DMGrowBuf)); | 115 memcpy(dst, src, sizeof(DMGrowBuf)); |
109 dst->is_const = TRUE; | 116 dst->is_const = TRUE; |
117 | |
110 return dst; | 118 return dst; |
111 } | 119 } |
112 | 120 |
113 | 121 |
114 DMGrowBuf * dmGrowBufCreateFrom(DMGrowBuf *dst, Uint8 *data, size_t len) | 122 DMGrowBuf * dmGrowBufCreateFrom(DMGrowBuf *dst, Uint8 *data, size_t len) |
115 { | 123 { |
116 dmGrowBufInit(dst); | 124 if (dmGrowBufInit(dst) != DMERR_OK) |
125 return NULL; | |
126 | |
127 DM_DBG("dmGrowBufCreateFrom(dst=%p, data=%p, len=%" DM_PRIu_SIZE_T ")\n", | |
128 dst, data, len); | |
117 | 129 |
118 dst->data = data; | 130 dst->data = data; |
119 dst->len = dst->size = len; | 131 dst->len = dst->size = len; |
120 dst->is_const = TRUE; | 132 dst->is_const = TRUE; |
121 | 133 |
124 | 136 |
125 | 137 |
126 static BOOL dmGrowBufRealloc(DMGrowBuf *buf, const size_t nsize, const BOOL clear) | 138 static BOOL dmGrowBufRealloc(DMGrowBuf *buf, const size_t nsize, const BOOL clear) |
127 { | 139 { |
128 DM_DBG("dmGrowBufRealloc(%p):\n" | 140 DM_DBG("dmGrowBufRealloc(%p):\n" |
129 " size=%" DM_PRIu_SIZE_T ", nsize=" DM_PRIu_SIZE_T | 141 " size=%" DM_PRIu_SIZE_T ", nsize=%" DM_PRIu_SIZE_T |
130 ", nstack=%d, offs=%" DM_PRIu_SIZE_T "\n", | 142 ", offs=%" DM_PRIu_SIZE_T "\n", |
131 buf, buf->size, nsize, buf->nstack, buf->offs); | 143 buf, buf->size, nsize, buf->offs); |
132 | 144 |
133 if (buf->is_const) | 145 if (buf->is_const) |
134 return FALSE; | 146 return FALSE; |
135 | 147 |
136 // Can't be smaller than current size! | 148 // Can't be smaller than current size! |