diff th_datastruct.c @ 457:85fa3d333556

Actually, revert the boolean changes .. meh.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 02 Jan 2018 23:09:29 +0200
parents 347bfd3e017e
children 761724e01c02
line wrap: on
line diff
--- a/th_datastruct.c	Tue Jan 02 22:57:47 2018 +0200
+++ b/th_datastruct.c	Tue Jan 02 23:09:29 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;
 }