annotate th_datastruct.c @ 754:d91d1174cfd8

Add th_llist_reverse() for reversing a linked list.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 01 Feb 2023 13:02:35 +0200
parents 64cb2b1777a9
children 3f84521fdd31
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
1 /*
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
2 * Various data structure functions
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
3 * Programmed and designed by Matti 'ccr' Hamalainen
726
29e44a58bc73 Bump copyrights.
Matti Hamalainen <ccr@tnsp.org>
parents: 722
diff changeset
4 * (C) Copyright 2002-2022 Tecnic Software productions (TNSP)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
5 *
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
6 * Please read file 'COPYING' for information on license and distribution.
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
7 */
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
8 #include "th_datastruct.h"
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
9
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
10 /*
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
11 * Doubly linked list handling
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
12 *
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
13 * In this implementation first node's prev points to last node of the list,
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
14 * and last node's next is NULL. This way we can semi-efficiently traverse to
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
15 * beginning and end of the list, assuming user does not do weird things.
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
16 */
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
17 th_llist_t * th_llist_new(void *data)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
18 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
19 th_llist_t *res = th_malloc0(sizeof(th_llist_t));
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
20 res->data = data;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
21 return res;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
22 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
23
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
24
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
25 void th_llist_free_func_node(th_llist_t *list, void (*freefunc)(th_llist_t *))
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
26 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
27 th_llist_t *curr = list;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
28
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
29 while (curr != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
30 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
31 th_llist_t *next = curr->next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
32 freefunc(curr);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
33 curr = next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
34 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
35 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
36
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
37
560
414755d33796 Rename th_llist_free_func() to th_llist_free_func_data() to make it a bit more clear what this function does.
Matti Hamalainen <ccr@tnsp.org>
parents: 553
diff changeset
38 void th_llist_free_func_data(th_llist_t *list, void (*freefunc)(void *data))
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
39 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
40 th_llist_t *curr = list;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
41
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
42 while (curr != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
43 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
44 th_llist_t *next = curr->next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
45 if (curr->data != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
46 freefunc(curr->data);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
47 th_free(curr);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
48 curr = next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
49 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
50 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
51
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
52
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
53 void th_llist_free(th_llist_t *list)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
54 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
55 th_llist_t *curr = list;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
56
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
57 while (curr != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
58 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
59 th_llist_t *next = curr->next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
60 th_free(curr);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
61 curr = next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
62 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
63 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
64
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
65
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
66 void th_llist_append_node(th_llist_t **list, th_llist_t *node)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
67 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
68 if (*list != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
69 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
70 node->prev = (*list)->prev;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
71 (*list)->prev->next = node;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
72 (*list)->prev = node;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
73 (*list)->num++;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
74 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
75 else
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
76 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
77 *list = node;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
78 node->prev = node;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
79 (*list)->num = 1;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
80 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
81
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
82 node->next = NULL;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
83 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
84
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
85
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
86 th_llist_t *th_llist_append(th_llist_t **list, void *data)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
87 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
88 th_llist_t *node = th_llist_new(data);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
89
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
90 th_llist_append_node(list, node);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
91
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
92 return node;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
93 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
94
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
95
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
96 void th_llist_prepend_node(th_llist_t **list, th_llist_t *node)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
97 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
98 if (*list != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
99 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
100 node->prev = (*list)->prev;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
101 node->next = *list;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
102 (*list)->prev = node;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
103 node->num = (*list)->num + 1;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
104 *list = node;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
105 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
106 else
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
107 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
108 *list = node->prev = node;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
109 node->next = NULL;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
110 (*list)->num = 1;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
111 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
112
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
113 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
114
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
115
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
116 th_llist_t *th_llist_prepend(th_llist_t **list, void *data)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
117 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
118 th_llist_t *node = th_llist_new(data);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
119
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
120 th_llist_prepend_node(list, node);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
121
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
122 return node;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
123 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
124
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
125 /*
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
126 1) Remove a middle node
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
127
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
128 node0->prev->next = node->next (node1)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
129 node0->next->prev = node->prev (list)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
130
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
131 node2 <- list <=> node0 <=> node1 <=> node2 -> NULL
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
132 node2 <- list <=> node1 <=> node2 -> NULL
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
133
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
134 2) Remove first node when many items
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
135
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
136
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
137 node2 <- list <=> node0 <=> node1 <=> node2 -> NULL
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
138 node2 <- node0 <=> node1 <=> node2 -> NULL
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
139
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
140 *list = node0
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
141
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
142 3) Remove last node in list
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
143
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
144 if (node->next == NULL) {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
145 list->prev = node->prev;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
146 node->prev->next = NULL;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
147 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
148
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
149 node2 <- list <=> node0 <=> node1 <=> node2 -> NULL
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
150 node1 <- list <=> node0 <=> node1 -> NULL
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
151
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
152 4) Remove last
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
153
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
154 list <- list -> NULL
441
2991e6b52d95 Get rid of trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 432
diff changeset
155
2991e6b52d95 Get rid of trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 432
diff changeset
156
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
157 */
689
9c61834c191b Remove th_llist_delete() and th_llist_delete_node() and rename
Matti Hamalainen <ccr@tnsp.org>
parents: 670
diff changeset
158 void th_llist_delete_node(th_llist_t **list, th_llist_t *node)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
159 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
160 if (node == *list)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
161 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
162 // First node in list
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
163 th_llist_t *tmp = (*list)->next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
164 if (tmp != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
165 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
166 tmp->num = (*list)->num - 1;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
167 tmp->prev = (*list)->prev;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
168 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
169 *list = tmp;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
170 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
171 else
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
172 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
173 // Somewhere in middle or end
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
174 if (node->prev != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
175 node->prev->next = node->next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
176
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
177 if (node->next != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
178 node->next->prev = node->prev;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
179 else
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
180 (*list)->prev = node; // Last node
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
181
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
182 (*list)->num--;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
183 }
441
2991e6b52d95 Get rid of trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 432
diff changeset
184
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
185 node->next = node->prev = NULL;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
186 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
187
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
188
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
189 th_llist_t * th_llist_get_nth(th_llist_t *list, const size_t n)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
190 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
191 th_llist_t *curr = list;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
192 size_t i;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
193
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
194 for (i = 0; curr != NULL && i < n; curr = curr->next, i++);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
195
349
5c5b3919263d th_llist_get_nth() returned last value of list if N > number of elements.
Matti Hamalainen <ccr@tnsp.org>
parents: 348
diff changeset
196 return (i == n) ? curr : NULL;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
197 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
198
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
199
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
200 size_t th_llist_length(const th_llist_t *list)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
201 {
348
a001708551d0 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 271
diff changeset
202 return (list == NULL) ? 0 : list->num;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
203 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
204
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
205
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
206 ssize_t th_llist_position(const th_llist_t *list, const th_llist_t *node)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
207 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
208 const th_llist_t *curr = list;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
209 ssize_t i = 0;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
210
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
211 while (curr != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
212 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
213 if (curr == node)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
214 return i;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
215 else
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
216 i++;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
217
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
218 curr = curr->next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
219 }
441
2991e6b52d95 Get rid of trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 432
diff changeset
220
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
221 return -1;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
222 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
223
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
224
754
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
225 void th_llist_reverse(th_llist_t **list)
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
226 {
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
227 th_llist_t *curr = *list, *prev = NULL;
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
228
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
229 while (curr != NULL)
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
230 {
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
231 th_llist_t *next = curr->next;
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
232 curr->next = prev;
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
233 prev = curr;
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
234 curr = next;
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
235 if (curr != NULL)
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
236 curr->prev = prev;
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
237 }
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
238
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
239 *list = prev;
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
240 }
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
241
d91d1174cfd8 Add th_llist_reverse() for reversing a linked list.
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
242
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
243 void th_llist_foreach(th_llist_t *list, void (*func)(th_llist_t *node, void *userdata), void *data)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
244 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
245 th_llist_t *curr = list;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
246
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
247 while (curr != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
248 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
249 func(curr, data);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
250 curr = curr->next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
251 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
252 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
253
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
254
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
255 int th_llist_foreach_cond(th_llist_t *list, int (*func)(th_llist_t *node, void *userdata), void *data, th_llist_t **ret)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
256 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
257 th_llist_t *curr = list;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
258
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
259 while (curr != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
260 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
261 int res = func(curr, data);
670
b383f4e6ab89 Use THERR_OK instead of 0.
Matti Hamalainen <ccr@tnsp.org>
parents: 632
diff changeset
262 if (res != THERR_OK)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
263 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
264 *ret = curr;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
265 return res;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
266 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
267 curr = curr->next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
268 }
441
2991e6b52d95 Get rid of trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 432
diff changeset
269
670
b383f4e6ab89 Use THERR_OK instead of 0.
Matti Hamalainen <ccr@tnsp.org>
parents: 632
diff changeset
270 return THERR_OK;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
271 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
272
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
273
753
64cb2b1777a9 Rename function th_llist_find() to th_llist_find_data().
Matti Hamalainen <ccr@tnsp.org>
parents: 752
diff changeset
274 th_llist_t * th_llist_find_data(th_llist_t *list, const void *data)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
275 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
276 th_llist_t *curr = list;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
277
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
278 while (curr != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
279 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
280 if (curr->data == data)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
281 return curr;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
282 curr = curr->next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
283 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
284
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
285 return NULL;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
286 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
287
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
288
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
289 th_llist_t * th_llist_find_func(th_llist_t *list, const void *userdata, int (compare)(const void *, const void *))
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
290 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
291 th_llist_t *curr = list;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
292
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
293 while (curr != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
294 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
295 if (compare(curr->data, userdata) == 0)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
296 return curr;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
297 curr = curr->next;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
298 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
299
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
300 return NULL;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
301 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
302
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
303
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
304 /*
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
305 * Ringbuffers
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
306 */
631
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
307 int th_ringbuf_init(th_ringbuf_t *buf, const size_t size, void (*mdeallocator)(void *data))
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
308 {
731
98d12f33da7b Change th_ringbuf_new() API.
Matti Hamalainen <ccr@tnsp.org>
parents: 730
diff changeset
309 memset(buf, 0, sizeof(*buf));
98d12f33da7b Change th_ringbuf_new() API.
Matti Hamalainen <ccr@tnsp.org>
parents: 730
diff changeset
310
631
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
311 // Must have at least 2 elements
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
312 if (size < 2)
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
313 return THERR_BOUNDS;
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
314
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
315 if ((buf->data = th_calloc(size, sizeof(void *))) == NULL)
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
316 return THERR_MALLOC;
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
317
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
318 buf->size = size;
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
319 buf->n = 0;
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
320 buf->deallocator = mdeallocator;
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
321
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
322 return THERR_OK;
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
323 }
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
324
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
325
731
98d12f33da7b Change th_ringbuf_new() API.
Matti Hamalainen <ccr@tnsp.org>
parents: 730
diff changeset
326 int th_ringbuf_new(th_ringbuf_t **buf, const size_t size, void (*mdeallocator)(void *data))
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
327 {
631
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
328 int res;
628
140e2272471c Add some error checking in th_ringbuf_new().
Matti Hamalainen <ccr@tnsp.org>
parents: 627
diff changeset
329
731
98d12f33da7b Change th_ringbuf_new() API.
Matti Hamalainen <ccr@tnsp.org>
parents: 730
diff changeset
330 if ((*buf = th_malloc0(sizeof(th_ringbuf_t))) == NULL)
98d12f33da7b Change th_ringbuf_new() API.
Matti Hamalainen <ccr@tnsp.org>
parents: 730
diff changeset
331 return THERR_MALLOC;
441
2991e6b52d95 Get rid of trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 432
diff changeset
332
731
98d12f33da7b Change th_ringbuf_new() API.
Matti Hamalainen <ccr@tnsp.org>
parents: 730
diff changeset
333 if ((res = th_ringbuf_init(*buf, size, mdeallocator)) != THERR_OK)
628
140e2272471c Add some error checking in th_ringbuf_new().
Matti Hamalainen <ccr@tnsp.org>
parents: 627
diff changeset
334 {
732
d190dccc3ee6 Fix free.
Matti Hamalainen <ccr@tnsp.org>
parents: 731
diff changeset
335 th_free(*buf);
731
98d12f33da7b Change th_ringbuf_new() API.
Matti Hamalainen <ccr@tnsp.org>
parents: 730
diff changeset
336 return res;
628
140e2272471c Add some error checking in th_ringbuf_new().
Matti Hamalainen <ccr@tnsp.org>
parents: 627
diff changeset
337 }
140e2272471c Add some error checking in th_ringbuf_new().
Matti Hamalainen <ccr@tnsp.org>
parents: 627
diff changeset
338
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
339 (*buf)->is_allocated = true;
731
98d12f33da7b Change th_ringbuf_new() API.
Matti Hamalainen <ccr@tnsp.org>
parents: 730
diff changeset
340
98d12f33da7b Change th_ringbuf_new() API.
Matti Hamalainen <ccr@tnsp.org>
parents: 730
diff changeset
341 return THERR_OK;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
342 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
343
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
344
632
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
345 int th_ringbuf_grow(th_ringbuf_t *buf, const size_t nadd)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
346 {
632
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
347 if (buf == NULL)
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
348 return THERR_NULLPTR;
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
349
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
350 buf->data = (void **) th_realloc(buf->data, (buf->size + nadd) * sizeof(void *));
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
351 if (buf->data == NULL)
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
352 return THERR_MALLOC;
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
353
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
354 memset(buf->data + buf->size, 0, sizeof(void *) * nadd);
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
355 buf->size += nadd;
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
356
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
357 return THERR_OK;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
358 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
359
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
360
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
361 void th_ringbuf_free(th_ringbuf_t *buf)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
362 {
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
363 if (buf != NULL)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
364 {
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
365 for (size_t i = 0; i < buf->size; i++)
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
366 {
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
367 buf->deallocator(buf->data[i]);
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
368 }
441
2991e6b52d95 Get rid of trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 432
diff changeset
369
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
370 th_free(buf->data);
631
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
371
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
372 if (buf->is_allocated)
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
373 th_free(buf);
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
374 }
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
375 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
376
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
377
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
378 void th_ringbuf_add(th_ringbuf_t *buf, void *ptr)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
379 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
380 if (buf->n < buf->size)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
381 buf->n++;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
382
730
1a3ea8f7bb35 Use specified deallocator for ringbuffers when rotating.
Matti Hamalainen <ccr@tnsp.org>
parents: 726
diff changeset
383 buf->deallocator(buf->data[0]);
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
384 memmove(&(buf->data[0]), &(buf->data[1]), (buf->size - 1) * sizeof(void *));
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
385 buf->data[buf->size - 1] = ptr;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
386 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
387
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
388
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
389 /*
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
390 * Growing buffer
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
391 */
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
392 void th_growbuf_clear(th_growbuf_t *buf)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
393 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
394 // Simply reset the current "length"
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
395 buf->len = 0;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
396 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
397
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
398
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
399 void th_growbuf_init(th_growbuf_t *buf, const size_t mingrow)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
400 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
401 // Initialize the buffer structure
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
402 memset(buf, 0, sizeof(th_growbuf_t));
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
403 buf->mingrow = mingrow;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
404 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
405
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
406
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
407 th_growbuf_t *th_growbuf_new(const size_t mingrow)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
408 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
409 th_growbuf_t *buf;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
410
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
411 if ((buf = th_malloc(sizeof(th_growbuf_t))) == NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
412 return NULL;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
413
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
414 th_growbuf_init(buf, mingrow);
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
415 buf->is_allocated = true;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
416
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
417 return buf;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
418 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
419
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
420
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
421 void th_growbuf_free(th_growbuf_t *buf)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
422 {
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
423 if (buf != NULL)
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
424 {
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
425 th_free(buf->data);
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
426
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
427 if (buf->is_allocated)
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
428 th_free(buf);
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
429 }
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
430 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
431
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
432
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
433 bool th_growbuf_grow(th_growbuf_t *buf, const size_t amount)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
434 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
435 if (buf == NULL)
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
436 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
437
464
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
438 if (buf->data == NULL || buf->len + amount >= buf->size)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
439 {
464
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
440 buf->size += amount + (buf->mingrow > 0 ? buf->mingrow : TH_BUFGROW);
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
441 if ((buf->data = th_realloc(buf->data, buf->size)) == NULL)
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
442 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
443 }
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
444 return true;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
445 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
446
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
447
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
448 bool th_growbuf_puts(th_growbuf_t *buf, const char *str, bool eos)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
449 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
450 size_t slen;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
451 if (str == NULL)
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
452 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
453
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
454 slen = strlen(str);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
455 if (!th_growbuf_grow(buf, slen + 1))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
456 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
457
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
458 memcpy(buf->data + buf->len, str, slen + 1);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
459 buf->len += eos ? (slen + 1) : slen;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
460
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
461 return true;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
462 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
463
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
464
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
465 bool th_growbuf_putch(th_growbuf_t *buf, const char ch)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
466 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
467 if (!th_growbuf_grow(buf, sizeof(char)))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
468 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
469
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
470 buf->data[buf->len++] = (uint8_t) ch;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
471
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
472 return true;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
473 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
474
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
475
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
476 bool th_growbuf_put_str(th_growbuf_t *buf, const void *str, const size_t len)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
477 {
464
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
478 if (str == NULL)
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
479 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
480
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
481 if (!th_growbuf_grow(buf, len + 1))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
482 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
483
464
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
484 memcpy(buf->data + buf->len, str, len + 1);
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
485 buf->len += len;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
486
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
487 return true;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
488 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
489
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
490
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
491 bool th_growbuf_put_u8(th_growbuf_t *buf, const uint8_t val)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
492 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
493 if (!th_growbuf_grow(buf, sizeof(uint8_t)))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
494 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
495
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
496 buf->data[buf->len++] = val;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
497
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
498 return true;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
499 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
500
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
501
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
502 bool th_growbuf_put_u16_be(th_growbuf_t *buf, const uint16_t val)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
503 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
504 if (!th_growbuf_grow(buf, sizeof(uint16_t)))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
505 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
506
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
507 buf->data[buf->len++] = (val >> 8) & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
508 buf->data[buf->len++] = val & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
509
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
510 return true;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
511 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
512
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
513
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
514 bool th_growbuf_put_u16_le(th_growbuf_t *buf, const uint16_t val)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
515 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
516 if (!th_growbuf_grow(buf, sizeof(uint16_t)))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
517 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
518
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
519 buf->data[buf->len++] = val & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
520 buf->data[buf->len++] = (val >> 8) & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
521
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
522 return true;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
523 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
524
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
525
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
526 bool th_growbuf_put_u32_be(th_growbuf_t *buf, const uint32_t val)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
527 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
528 if (!th_growbuf_grow(buf, sizeof(uint32_t)))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
529 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
530
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
531 buf->data[buf->len++] = (val >> 24) & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
532 buf->data[buf->len++] = (val >> 16) & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
533 buf->data[buf->len++] = (val >> 8) & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
534 buf->data[buf->len++] = val & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
535
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
536 return true;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
537 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
538
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
539
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
540 bool th_growbuf_put_u32_le(th_growbuf_t *buf, const uint32_t val)
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
541 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
542 if (!th_growbuf_grow(buf, sizeof(uint32_t)))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
543 return false;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
544
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
545 buf->data[buf->len++] = val & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
546 buf->data[buf->len++] = (val >> 8) & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
547 buf->data[buf->len++] = (val >> 16) & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
548 buf->data[buf->len++] = (val >> 24) & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
549
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
550 return true;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
551 }
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
552
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
553
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
554 /*
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
555 * Simple legacy string growing buffer
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
556 */
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
557 bool th_strbuf_grow(char **buf, size_t *bufsize, size_t *len, size_t grow)
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
558 {
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
559 if (*buf == NULL)
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
560 *bufsize = *len = 0;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
561
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
562 if (*buf == NULL || *len + grow >= *bufsize)
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
563 {
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
564 *bufsize += grow + TH_BUFGROW;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
565 *buf = th_realloc(*buf, *bufsize);
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
566 if (*buf == NULL)
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
567 return false;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
568 }
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
569 return true;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
570 }
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
571
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
572
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
573 bool th_strbuf_putch(char **buf, size_t *bufsize, size_t *len, const uint8_t ch)
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
574 {
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
575 if (!th_strbuf_grow(buf, bufsize, len, 1))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
576 return false;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
577
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
578 (*buf)[*len] = ch;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
579 (*len)++;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
580
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
581 return true;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
582 }
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
583
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
584
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
585 bool th_strbuf_putsn(char **buf, size_t *bufsize, size_t *len, const char *str, const size_t slen)
445
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
586 {
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
587 if (str == NULL)
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
588 return false;
445
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
589
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
590 if (!th_strbuf_grow(buf, bufsize, len, slen + 1))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
591 return false;
445
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
592
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
593 memcpy(*buf + *len, str, slen);
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
594 (*len) += slen;
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
595 *(buf + *len + slen) = 0;
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
596
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
597 return true;
445
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
598 }
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
599
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
600
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
601 bool th_strbuf_puts(char **buf, size_t *bufsize, size_t *len, const char *str)
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
602 {
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
603 size_t slen;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
604 if (str == NULL)
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
605 return false;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
606
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
607 slen = strlen(str);
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
608 if (!th_strbuf_grow(buf, bufsize, len, slen + 1))
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
609 return false;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
610
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
611 memcpy(*buf + *len, str, slen + 1);
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
612 (*len) += slen;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
613
735
31bc1ed07cf5 Renaming BOOL->bool and TRUE/FALSE to true/false, and using stdbool.h if available.
Matti Hamalainen <ccr@tnsp.org>
parents: 733
diff changeset
614 return true;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
615 }
736
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
616
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
617
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
618 int th_ptrlist_init(th_ptrlist_t *list, const size_t ninitial, const size_t ngrow)
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
619 {
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
620 if (list == NULL)
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
621 return THERR_NULLPTR;
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
622
736
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
623 memset(list, 0, sizeof(*list));
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
624
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
625 if (ngrow == 0)
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
626 return THERR_INVALID_ARGS;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
627
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
628 list->nitems = 0;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
629 list->nallocated = ninitial;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
630 list->ngrow = ngrow;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
631
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
632 if ((list->items = th_malloc(list->nallocated * sizeof(void *))) == NULL)
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
633 return THERR_MALLOC;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
634
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
635 return THERR_OK;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
636 }
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
637
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
638
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
639 int th_ptrlist_new(th_ptrlist_t **list, const size_t ninitial, const size_t ngrow)
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
640 {
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
641 int res;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
642
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
643 if (list == NULL)
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
644 return THERR_NULLPTR;
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
645
736
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
646 if ((*list = th_malloc0(sizeof(th_ptrlist_t))) == NULL)
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
647 return THERR_MALLOC;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
648
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
649 if ((res = th_ptrlist_init(*list, ninitial, ngrow)) != THERR_OK)
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
650 {
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
651 th_free(*list);
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
652 return res;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
653 }
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
654
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
655 (*list)->is_allocated = true;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
656
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
657 return THERR_OK;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
658 }
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
659
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
660
751
3091fd1987e9 Rename function argument.
Matti Hamalainen <ccr@tnsp.org>
parents: 736
diff changeset
661 int th_ptrlist_append(th_ptrlist_t *list, void *data)
736
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
662 {
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
663 if (list == NULL)
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
664 return THERR_NULLPTR;
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
665
736
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
666 if (list->nitems + 1 >= list->nallocated)
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
667 {
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
668 list->nallocated += list->ngrow;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
669 if ((list->items = th_realloc(list->items, list->nallocated * sizeof(void *))) == NULL)
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
670 return THERR_MALLOC;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
671 }
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
672
751
3091fd1987e9 Rename function argument.
Matti Hamalainen <ccr@tnsp.org>
parents: 736
diff changeset
673 list->items[list->nitems++] = data;
736
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
674
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
675 return THERR_OK;
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
676 }
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
677
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
678
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
679 void th_ptrlist_free(th_ptrlist_t *list, void (*mdeallocator)(void *data))
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
680 {
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
681 if (list != NULL)
736
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
682 {
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
683 if (mdeallocator != NULL)
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
684 {
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
685 for (size_t i = 0; i < list->nitems; i++)
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
686 mdeallocator(list->items[i]);
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
687 }
736
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
688
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
689 th_free(list->items);
736
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
690
752
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
691 if (list->is_allocated)
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
692 th_free(list);
3710c117b7c7 Add some NULL pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
693 }
736
ca837a4417f5 Add simple growing pointerlist data stucture implementation.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
694 }