Mercurial > hg > th-libs

annotate th_datastruct.c @ 689:9c61834c191b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove th_llist_delete() and th_llist_delete_node() and rename th_llist_delete_node_fast() to th_llist_delete_node().
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 09 Mar 2020 15:20:49 +0200
parents b383f4e6ab89
children 4ca6a3b30fe8
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
553
3a852e9f70a6 Bump copyright years.
Matti Hamalainen <ccr@tnsp.org>
parents: 481
diff changeset
4 * (C) Copyright 2002-2020 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
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
225 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
226 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
227 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
228
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
229 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
230 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
231 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
232 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
233 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
234 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
235
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
236
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
237 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
238 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
239 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
240
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
241 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
242 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
243 int res = func(curr, data);
670
b383f4e6ab89 Use THERR_OK instead of 0.
Matti Hamalainen <ccr@tnsp.org>
parents: 632
diff changeset
244 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
245 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
246 *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
247 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
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 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
250 }
441
2991e6b52d95 Get rid of trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 432
diff changeset
251
670
b383f4e6ab89 Use THERR_OK instead of 0.
Matti Hamalainen <ccr@tnsp.org>
parents: 632
diff changeset
252 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
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
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
256 th_llist_t * th_llist_find(th_llist_t *list, const 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
257 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
258 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
259
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
260 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
261 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
262 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
263 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
264 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
265 }
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 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
268 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
270
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
271 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
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 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
274
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
275 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
276 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
277 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
278 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
279 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
280 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
281
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
282 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
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
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 * Ringbuffers
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
288 */
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
289 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
290 {
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
291 // 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
292 memset(buf, 0, sizeof(th_ringbuf_t));
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
293
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
294 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
295 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
296
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
297 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
298 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
299
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
300 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
301 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
302 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
303
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
304 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
305 }
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
306
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
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
308 th_ringbuf_t * th_ringbuf_new(const size_t size, void (*mdeallocator)(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
309 {
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
310 th_ringbuf_t *buf;
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 int res;
628
140e2272471c Add some error checking in th_ringbuf_new().
Matti Hamalainen <ccr@tnsp.org>
parents: 627
diff changeset
312
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
313 if ((buf = th_malloc0(sizeof(th_ringbuf_t))) == NULL)
628
140e2272471c Add some error checking in th_ringbuf_new().
Matti Hamalainen <ccr@tnsp.org>
parents: 627
diff changeset
314 return NULL;
441
2991e6b52d95 Get rid of trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 432
diff changeset
315
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
316 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
317 {
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
318 th_free(buf);
628
140e2272471c Add some error checking in th_ringbuf_new().
Matti Hamalainen <ccr@tnsp.org>
parents: 627
diff changeset
319 return NULL;
140e2272471c Add some error checking in th_ringbuf_new().
Matti Hamalainen <ccr@tnsp.org>
parents: 627
diff changeset
320 }
140e2272471c Add some error checking in th_ringbuf_new().
Matti Hamalainen <ccr@tnsp.org>
parents: 627
diff changeset
321
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
322 buf->allocated = TRUE;
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 return buf;
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
324 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
325
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
326
632
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
327 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
328 {
632
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
329 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
330 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
331
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
332 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
333 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
334 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
335
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
336 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
337 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
338
553db886533e Return a THERR_* error value from th_ringbuf_grow() instead of BOOL. This
Matti Hamalainen <ccr@tnsp.org>
parents: 631
diff changeset
339 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
340 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
341
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 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
344 {
626
98c8bd80f633 Fix ringbuf size and n types.
Matti Hamalainen <ccr@tnsp.org>
parents: 581
diff changeset
345 for (size_t i = 0; i < buf->size; i++)
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 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
347 if (buf->data[i] != NULL)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
348 buf->deallocator(buf->data[i]);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
349 }
441
2991e6b52d95 Get rid of trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 432
diff changeset
350
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
351 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
352
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
353 if (buf->allocated)
d5221299656a Add new function th_ringbuf_init() and add "allocated" field to th_ringbuf_t
Matti Hamalainen <ccr@tnsp.org>
parents: 629
diff changeset
354 th_free(buf);
269
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
355 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
356
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
357
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
358 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
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 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
361 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
362
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
363 th_free(buf->data[0]);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
364 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
365 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
366 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
367
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
368
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
369 /*
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
370 * 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
371 */
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
372 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
373 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
374 // 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
375 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
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
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
379 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
380 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
381 // 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
382 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
383 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
384 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
385
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 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
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 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
390
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
391 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
392 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
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 th_growbuf_init(buf, mingrow);
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
395 buf->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
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 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
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
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 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
402 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
403 th_free(buf->data);
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 if (buf->allocated)
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
406 th_free(buf);
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
407 }
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
464
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
410 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
411 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
412 if (buf == NULL)
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
413 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
414
464
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
415 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
416 {
464
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
417 buf->size += amount + (buf->mingrow > 0 ? buf->mingrow : TH_BUFGROW);
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
418 if ((buf->data = th_realloc(buf->data, buf->size)) == NULL)
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
419 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
420 }
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
421 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
422 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
423
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
424
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
425 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
426 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
427 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
428 if (str == NULL)
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
429 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
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 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
432 if (!th_growbuf_grow(buf, slen + 1))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
433 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
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 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
436 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
437
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
438 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
439 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
440
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
441
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
442 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
443 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
444 if (!th_growbuf_grow(buf, sizeof(char)))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
445 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
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 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
448
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
449 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
450 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
451
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
452
464
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
453 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
454 {
464
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
455 if (str == NULL)
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
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 if (!th_growbuf_grow(buf, len + 1))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
459 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
460
464
761724e01c02 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 457
diff changeset
461 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
462 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
463
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
464 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
465 }
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
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
468 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
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 if (!th_growbuf_grow(buf, sizeof(uint8_t)))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
471 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
472
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
473 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
474
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
475 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
476 }
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
477
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
478
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
479 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
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, sizeof(uint16_t)))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
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
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
484 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
485 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
486
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
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
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
491 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
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(uint16_t)))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
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 & 0xff;
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
497 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
498
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
499 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
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
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
502
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
503 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
504 {
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
505 if (!th_growbuf_grow(buf, sizeof(uint32_t)))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
506 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
507
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 >> 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
509 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
510 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
511 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
512
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
513 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
514 }
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
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
517 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
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 if (!th_growbuf_grow(buf, sizeof(uint32_t)))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
520 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
521
fcbdc12f5866 Split data structures (linked lists, growbufs, ringbufs, etc.) code into th_datastruct.[ch] module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
522 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
523 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
524 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
525 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
526
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
527 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
528 }
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
529
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
530
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
531 /*
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
532 * 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
533 */
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
534 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
535 {
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
536 if (*buf == NULL)
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
537 *bufsize = *len = 0;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
538
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
539 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
540 {
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
541 *bufsize += grow + TH_BUFGROW;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
542 *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
543 if (*buf == NULL)
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
544 return FALSE;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
545 }
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
546 return TRUE;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
547 }
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
548
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
549
581
935ee9a9f631 Change 'ch' argument of th_strbuf_putch from char to uint8_t.
Matti Hamalainen <ccr@tnsp.org>
parents: 560
diff changeset
550 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
551 {
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
552 if (!th_strbuf_grow(buf, bufsize, len, 1))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
553 return FALSE;
271
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 (*buf)[*len] = ch;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
556 (*len)++;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
557
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
558 return TRUE;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
559 }
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
560
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
561
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
562 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
563 {
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
564 if (str == NULL)
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
565 return FALSE;
445
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
566
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
567 if (!th_strbuf_grow(buf, bufsize, len, slen + 1))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
568 return FALSE;
445
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
569
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
570 memcpy(*buf + *len, str, slen);
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
571 (*len) += slen;
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
572 *(buf + *len + slen) = 0;
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
573
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
574 return TRUE;
445
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
575 }
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
576
6d29aaeab290 Add new function th_strbuf_putsn().
Matti Hamalainen <ccr@tnsp.org>
parents: 441
diff changeset
577
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
578 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
579 {
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
580 size_t slen;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
581 if (str == NULL)
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
582 return FALSE;
271
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 slen = strlen(str);
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
585 if (!th_strbuf_grow(buf, bufsize, len, slen + 1))
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
586 return FALSE;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
587
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
588 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
589 (*len) += slen;
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
590
457
85fa3d333556 Actually, revert the boolean changes .. meh.
Matti Hamalainen <ccr@tnsp.org>
parents: 454
diff changeset
591 return TRUE;
271
2f067fbf6f13 Oops, forgot to move th_strbuf_* functions into datastruct module.
Matti Hamalainen <ccr@tnsp.org>
parents: 269
diff changeset
592 }