Sat, 19 Jan 2013 20:51:16 +0100
some fixes
13 | 1 | #include "dlist.h" |
2 | ||
15
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
3 | UcxDlist *ucx_dlist_clone(UcxDlist *l, copy_func fnc, void *data) { |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
4 | UcxDlist *ret = NULL; |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
5 | while (l != NULL) { |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
6 | if (fnc != NULL) { |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
7 | ret = ucx_dlist_append(ret, fnc(l->data, data)); |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
8 | } else { |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
9 | ret = ucx_dlist_append(ret, l->data); |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
10 | } |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
11 | l = l->next; |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
12 | } |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
13 | return ret; |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
14 | } |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
15 | |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
16 | int ucx_dlist_equals(UcxDlist *l1, UcxDlist *l2, cmp_func fnc, void* data) { |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
17 | if (l1 == l2) return 1; |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
18 | |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
19 | while (l1 != NULL && l2 != NULL) { |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
20 | if (fnc == NULL) { |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
21 | if (l1->data != l2->data) return 0; |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
22 | } else { |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
23 | if (fnc(l1->data, l2->data, data) != 0) return 0; |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
24 | } |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
25 | l1 = l1->next; |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
26 | l2 = l2->next; |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
27 | } |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
28 | |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
29 | return (l1 == NULL && l2 == NULL); |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
30 | } |
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
31 | |
13 | 32 | void ucx_dlist_free(UcxDlist *l) { |
33 | UcxDlist *e = l, *f; | |
34 | while (e != NULL) { | |
35 | f = e; | |
36 | e = e->next; | |
37 | free(f); | |
38 | } | |
39 | } | |
40 | ||
41 | UcxDlist *ucx_dlist_append(UcxDlist *l, void *data) { | |
42 | UcxDlist *nl = (UcxDlist*) malloc(sizeof(UcxDlist)); | |
43 | if (nl == NULL) return NULL; | |
15
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
44 | |
13 | 45 | nl->data = data; |
46 | nl->next = NULL; | |
47 | if (l == NULL) { | |
30
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
48 | nl->prev = NULL; |
13 | 49 | return nl; |
50 | } else { | |
51 | UcxDlist *t = ucx_dlist_last(l); | |
52 | t->next = nl; | |
53 | nl->prev = t; | |
54 | return l; | |
55 | } | |
56 | } | |
57 | ||
58 | UcxDlist *ucx_dlist_prepend(UcxDlist *l, void *data) { | |
59 | UcxDlist *nl = ucx_dlist_append(NULL, data); | |
60 | if (nl == NULL) return NULL; | |
15
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
61 | |
13 | 62 | if (l != NULL) { |
63 | nl->next = l; | |
64 | l->prev = nl; | |
65 | } | |
66 | return nl; | |
67 | } | |
68 | ||
69 | UcxDlist *ucx_dlist_concat(UcxDlist *l1, UcxDlist *l2) { | |
70 | if (l1 == NULL) { | |
71 | return l2; | |
72 | } else { | |
73 | UcxDlist *last = ucx_dlist_last(l1); | |
74 | last->next = l2; | |
75 | l2->prev = last; | |
76 | return l1; | |
77 | } | |
78 | } | |
79 | ||
80 | UcxDlist *ucx_dlist_last(UcxDlist *l) { | |
81 | if (l == NULL) return NULL; | |
15
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
82 | |
13 | 83 | UcxDlist *e = l; |
84 | while (e->next != NULL) { | |
85 | e = e->next; | |
86 | } | |
87 | return e; | |
88 | } | |
89 | ||
90 | UcxDlist *ucx_dlist_get(UcxDlist *l, int index) { | |
91 | if (l == NULL) return NULL; | |
92 | ||
93 | UcxDlist *e = l; | |
94 | while (e->next != NULL && index > 0) { | |
95 | e = e->next; | |
96 | index--; | |
97 | } | |
15
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
98 | |
13 | 99 | return index == 0 ? e : NULL; |
100 | } | |
101 | ||
102 | size_t ucx_dlist_size(UcxDlist *l) { | |
103 | if (l == NULL) return 0; | |
15
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
104 | |
13 | 105 | UcxDlist *e = l; |
106 | size_t s = 1; | |
107 | while (e->next != NULL) { | |
108 | e = e->next; | |
109 | s++; | |
110 | } | |
111 | ||
112 | return s; | |
113 | } | |
114 | ||
36
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
115 | UcxDlist *ucx_dlist_sort_merge(int length, |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
116 | UcxDlist* ls, UcxDlist* rs, UcxDlist* le, UcxDlist* re, |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
117 | cmp_func fnc, void* data) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
118 | UcxDlist *sorted[length]; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
119 | UcxDlist *rc, *lc; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
120 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
121 | lc = ls; rc = rs; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
122 | int n = 0; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
123 | while (lc != le && rc != re) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
124 | if (fnc(lc->data, rc->data, data) <= 0) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
125 | sorted[n] = lc; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
126 | lc = lc->next; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
127 | } else { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
128 | sorted[n] = rc; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
129 | rc = rc->next; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
130 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
131 | n++; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
132 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
133 | while (lc != le) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
134 | sorted[n] = lc; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
135 | lc = lc->next; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
136 | n++; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
137 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
138 | while (rc != re) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
139 | sorted[n] = rc; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
140 | rc = rc->next; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
141 | n++; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
142 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
143 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
144 | // Update pointer |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
145 | sorted[0]->prev = NULL; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
146 | for (int i = 0 ; i < length-1 ; i++) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
147 | sorted[i]->next = sorted[i+1]; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
148 | sorted[i+1]->prev = sorted[i]; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
149 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
150 | sorted[length-1]->next = NULL; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
151 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
152 | return sorted[0]; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
153 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
154 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
155 | UcxDlist *ucx_dlist_sort(UcxDlist *l, cmp_func fnc, void *data) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
156 | if (l == NULL) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
157 | return NULL; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
158 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
159 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
160 | UcxDlist *lc; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
161 | int ln = 1; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
162 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
163 | UcxDlist *ls = l, *le; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
164 | lc = ls; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
165 | while (lc->next != NULL && fnc(lc->next->data, lc->data, data) > 0) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
166 | lc = lc->next; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
167 | ln++; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
168 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
169 | le = lc->next; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
170 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
171 | UcxDlist *rs = le, *re; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
172 | if (rs == NULL) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
173 | return l; // this list is already sorted :) |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
174 | } else { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
175 | UcxDlist *rc; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
176 | int rn = 1; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
177 | rc = rs; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
178 | while (rc->next != NULL && fnc(rc->next->data, rc->data, data) > 0) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
179 | rc = rc->next; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
180 | rn++; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
181 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
182 | re = rc->next; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
183 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
184 | // Something left? Sort it! |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
185 | UcxDlist *remainder = re; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
186 | size_t remainder_length = ucx_dlist_size(remainder); |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
187 | if (remainder != NULL) { |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
188 | remainder = ucx_dlist_sort(remainder, fnc, data); |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
189 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
190 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
191 | // {ls,...,le->prev} and {rs,...,re->prev} are sorted - merge them |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
192 | UcxDlist *sorted = ucx_dlist_sort_merge(ln+rn, |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
193 | ls, rs, le, re, |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
194 | fnc, data); |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
195 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
196 | // merge sorted list with (also sorted) remainder |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
197 | l = ucx_dlist_sort_merge(ln+rn+remainder_length, |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
198 | sorted, remainder, NULL, NULL, |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
199 | fnc, data); |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
200 | |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
201 | return l; |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
202 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
203 | } |
450d2d5f4735
server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
204 | |
13 | 205 | /* dlist specific functions */ |
206 | UcxDlist *ucx_dlist_first(UcxDlist *l) { | |
207 | if (l == NULL) return NULL; | |
15
cff9c4101dd7
Replaced old utils with ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
208 | |
13 | 209 | UcxDlist *e = l; |
210 | while (e->prev != NULL) { | |
211 | e = e->prev; | |
212 | } | |
213 | return e; | |
214 | } | |
30
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
215 | |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
216 | UcxDlist *ucx_dlist_remove(UcxDlist *l, UcxDlist *e) { |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
217 | if (e->prev == NULL) { |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
218 | if(e->next != NULL) { |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
219 | e->next->prev = NULL; |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
220 | l = e->next; |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
221 | } else { |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
222 | l = NULL; |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
223 | } |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
224 | |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
225 | } else { |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
226 | e->prev->next = e->next; |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
227 | e->next->prev = e->prev; |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
228 | } |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
229 | free(e); |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
230 | return l; |
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
231 | } |