diff options
| author | Přemysl Janouch <p.janouch@gmail.com> | 2017-01-23 23:14:04 +0100 |
|---|---|---|
| committer | Přemysl Janouch <p.janouch@gmail.com> | 2017-01-23 23:14:04 +0100 |
| commit | 084e964286bfcd13ee6a25a2ee35dfba9da1072e (patch) | |
| tree | e1680ea3aaa78320f7b589f37a96eb3bbc929a6a | |
| parent | 0e08055d6d361d2a902225046e1e463bc8ce50c0 (diff) | |
| download | liberty-084e964286bfcd13ee6a25a2ee35dfba9da1072e.tar.gz liberty-084e964286bfcd13ee6a25a2ee35dfba9da1072e.tar.xz liberty-084e964286bfcd13ee6a25a2ee35dfba9da1072e.zip | |
Fixes to the previous batch of commits
| -rw-r--r-- | liberty-tui.c | 4 | ||||
| -rw-r--r-- | liberty.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/liberty-tui.c b/liberty-tui.c index 4d48c2a..7cc9bfb 100644 --- a/liberty-tui.c +++ b/liberty-tui.c @@ -194,9 +194,7 @@ row_buffer_space (struct row_buffer *self, int width, chtype attrs) if (width < 0) return; - while (self->chars_len + width >= self->chars_alloc) - self->chars = xreallocarray (self->chars, - sizeof *self->chars, (self->chars_alloc <<= 1)); + ARRAY_RESERVE (self->chars, (size_t) width); struct row_char space = { .attrs = attrs, .c = ' ', .width = 1 }; self->total_width += width; @@ -305,17 +305,17 @@ xstrndup (const char *s, size_t n) // The most basic helper macros to make working with arrays not suck -#define ARRAY(type, name) type *name; size_t name ## _len, name ## _size; +#define ARRAY(type, name) type *name; size_t name ## _len, name ## _alloc; #define ARRAY_INIT_SIZED(a, n) \ BLOCK_START \ - (a) = xcalloc (sizeof *(a), (a ## _size) = (n)); \ + (a) = xcalloc (sizeof *(a), (a ## _alloc) = (n)); \ (a ## _len) = 0; \ BLOCK_END #define ARRAY_INIT(a) ARRAY_INIT_SIZED (a, 16) #define ARRAY_RESERVE(a, n) \ BLOCK_START \ - while ((a ## _size) - (a ## _len) < n) \ - (a) = xreallocarray ((a), sizeof *(a), (a ## _size) <<= 1); \ + while ((a ## _alloc) - (a ## _len) < n) \ + (a) = xreallocarray ((a), sizeof *(a), (a ## _alloc) <<= 1); \ BLOCK_END // --- Double-linked list helpers ---------------------------------------------- |