Mercurial > hg > th-libs
diff th_datastruct.c @ 453:efd33accdc81
Break backwards compatibility by renaming BOOL, TRUE and FALSE to lowercase.
Introduce optional but default use of stdbool.h.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 02 Jan 2018 22:56:03 +0200 |
parents | 6d29aaeab290 |
children | 347bfd3e017e |
line wrap: on
line diff
--- a/th_datastruct.c Wed Oct 25 22:32:07 2017 +0300 +++ b/th_datastruct.c Tue Jan 02 22:56:03 2018 +0200 @@ -335,16 +335,16 @@ } -BOOL th_ringbuf_grow(th_ringbuf_t *buf, const size_t n) +bool th_ringbuf_grow(th_ringbuf_t *buf, const size_t n) { buf->data = (char **) th_realloc(buf->data, (buf->size + n) * sizeof(char *)); if (buf->data != NULL) { memset(buf->data + buf->size, 0, sizeof(char *) * n); buf->size += n; - return TRUE; + return true; } else - return FALSE; + return false; } @@ -400,7 +400,7 @@ return NULL; th_growbuf_init(buf, mingrow); - buf->allocated = TRUE; + buf->allocated = true; return buf; } @@ -415,132 +415,132 @@ } -BOOL th_growbuf_grow(th_growbuf_t *buf, const size_t grow) +bool th_growbuf_grow(th_growbuf_t *buf, const size_t grow) { if (buf == NULL) - return FALSE; + return false; if (buf->data == NULL || buf->len + grow >= buf->size) { buf->size += grow + (buf->mingrow > 0 ? buf->mingrow : TH_BUFGROW); buf->data = (uint8_t *) th_realloc(buf->data, buf->size); if (buf->data == NULL) - return FALSE; + return false; } - return TRUE; + return true; } -BOOL th_growbuf_puts(th_growbuf_t *buf, const char *str, BOOL eos) +bool th_growbuf_puts(th_growbuf_t *buf, const char *str, bool eos) { size_t slen; if (str == NULL) - return FALSE; + return false; slen = strlen(str); if (!th_growbuf_grow(buf, slen + 1)) - return FALSE; + return false; memcpy(buf->data + buf->len, str, slen + 1); buf->len += eos ? (slen + 1) : slen; - return TRUE; + return true; } -BOOL th_growbuf_putch(th_growbuf_t *buf, const char ch) +bool th_growbuf_putch(th_growbuf_t *buf, const char ch) { if (!th_growbuf_grow(buf, sizeof(char))) - return FALSE; + return false; buf->data[buf->len++] = (uint8_t) ch; - return TRUE; + return true; } -BOOL th_growbuf_put_str(th_growbuf_t *buf, const void *s, const size_t len) +bool th_growbuf_put_str(th_growbuf_t *buf, const void *s, const size_t len) { if (s == NULL) - return FALSE; + return false; if (!th_growbuf_grow(buf, len + 1)) - return FALSE; + return false; memcpy(buf->data + buf->len, s, len + 1); buf->len += len; - return TRUE; + return true; } -BOOL th_growbuf_put_u8(th_growbuf_t *buf, const uint8_t val) +bool th_growbuf_put_u8(th_growbuf_t *buf, const uint8_t val) { if (!th_growbuf_grow(buf, sizeof(uint8_t))) - return FALSE; + return false; buf->data[buf->len++] = val; - return TRUE; + return true; } -BOOL th_growbuf_put_u16_be(th_growbuf_t *buf, const uint16_t val) +bool th_growbuf_put_u16_be(th_growbuf_t *buf, const uint16_t val) { if (!th_growbuf_grow(buf, sizeof(uint16_t))) - return FALSE; + return false; buf->data[buf->len++] = (val >> 8) & 0xff; buf->data[buf->len++] = val & 0xff; - return TRUE; + return true; } -BOOL th_growbuf_put_u16_le(th_growbuf_t *buf, const uint16_t val) +bool th_growbuf_put_u16_le(th_growbuf_t *buf, const uint16_t val) { if (!th_growbuf_grow(buf, sizeof(uint16_t))) - return FALSE; + return false; buf->data[buf->len++] = val & 0xff; buf->data[buf->len++] = (val >> 8) & 0xff; - return TRUE; + return true; } -BOOL th_growbuf_put_u32_be(th_growbuf_t *buf, const uint32_t val) +bool th_growbuf_put_u32_be(th_growbuf_t *buf, const uint32_t val) { if (!th_growbuf_grow(buf, sizeof(uint32_t))) - return FALSE; + return false; buf->data[buf->len++] = (val >> 24) & 0xff; buf->data[buf->len++] = (val >> 16) & 0xff; buf->data[buf->len++] = (val >> 8) & 0xff; buf->data[buf->len++] = val & 0xff; - return TRUE; + return true; } -BOOL th_growbuf_put_u32_le(th_growbuf_t *buf, const uint32_t val) +bool th_growbuf_put_u32_le(th_growbuf_t *buf, const uint32_t val) { if (!th_growbuf_grow(buf, sizeof(uint32_t))) - return FALSE; + return false; buf->data[buf->len++] = val & 0xff; buf->data[buf->len++] = (val >> 8) & 0xff; buf->data[buf->len++] = (val >> 16) & 0xff; buf->data[buf->len++] = (val >> 24) & 0xff; - return TRUE; + return true; } /* * Simple legacy string growing buffer */ -BOOL th_strbuf_grow(char **buf, size_t *bufsize, size_t *len, size_t grow) +bool th_strbuf_grow(char **buf, size_t *bufsize, size_t *len, size_t grow) { if (*buf == NULL) *bufsize = *len = 0; @@ -550,52 +550,52 @@ *bufsize += grow + TH_BUFGROW; *buf = th_realloc(*buf, *bufsize); if (*buf == NULL) - return FALSE; + return false; } - return TRUE; + return true; } -BOOL th_strbuf_putch(char **buf, size_t *bufsize, size_t *len, const char ch) +bool th_strbuf_putch(char **buf, size_t *bufsize, size_t *len, const char ch) { if (!th_strbuf_grow(buf, bufsize, len, 1)) - return FALSE; + return false; (*buf)[*len] = ch; (*len)++; - return TRUE; + return true; } -BOOL th_strbuf_putsn(char **buf, size_t *bufsize, size_t *len, const char *str, const size_t slen) +bool th_strbuf_putsn(char **buf, size_t *bufsize, size_t *len, const char *str, const size_t slen) { if (str == NULL) - return FALSE; + return false; if (!th_strbuf_grow(buf, bufsize, len, slen + 1)) - return FALSE; + return false; memcpy(*buf + *len, str, slen); (*len) += slen; *(buf + *len + slen) = 0; - return TRUE; + return true; } -BOOL th_strbuf_puts(char **buf, size_t *bufsize, size_t *len, const char *str) +bool th_strbuf_puts(char **buf, size_t *bufsize, size_t *len, const char *str) { size_t slen; if (str == NULL) - return FALSE; + return false; slen = strlen(str); if (!th_strbuf_grow(buf, bufsize, len, slen + 1)) - return FALSE; + return false; memcpy(*buf + *len, str, slen + 1); (*len) += slen; - return TRUE; + return true; }