src/list.c

Wed, 16 May 2018 19:27:45 +0200

author
Mike Becker <universe@uap-core.de>
date
Wed, 16 May 2018 19:27:45 +0200
changeset 321
9af21a50b516
parent 291
deb0035635eb
child 323
b8c49e7a1dba
permissions
-rw-r--r--

adds scstr_t to modules.md + fixes parenthesis bug in sstrsplit_a macro

103
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
1 /*
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
3 *
259
2f5dea574a75 modules documentation
Mike Becker <universe@uap-core.de>
parents: 253
diff changeset
4 * Copyright 2017 Mike Becker, Olaf Wintermann All rights reserved.
103
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
5 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
6 * Redistribution and use in source and binary forms, with or without
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
7 * modification, are permitted provided that the following conditions are met:
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
8 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
10 * notice, this list of conditions and the following disclaimer.
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
11 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
14 * documentation and/or other materials provided with the distribution.
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
15 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
27 */
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
28
251
fae240d633fc changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents: 250
diff changeset
29 #include "ucx/list.h"
4
dbc31727b38e added dlist specification
Mike Becker <universe@uap-core.de>
parents:
diff changeset
30
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
31 UcxList *ucx_list_clone(UcxList *l, copy_func fnc, void *data) {
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
32 return ucx_list_clone_a(ucx_default_allocator(), l, fnc, data);
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
33 }
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
34
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
35 UcxList *ucx_list_clone_a(UcxAllocator *alloc, UcxList *l,
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
36 copy_func fnc, void *data) {
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
37 UcxList *ret = NULL;
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
38 while (l) {
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
39 if (fnc) {
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
40 ret = ucx_list_append_a(alloc, ret, fnc(l->data, data));
18
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
41 } else {
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
42 ret = ucx_list_append_a(alloc, ret, l->data);
18
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
43 }
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
44 l = l->next;
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
45 }
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
46 return ret;
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
47 }
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
48
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
49 int ucx_list_equals(const UcxList *l1, const UcxList *l2,
67
27e67e725d35 added some qualifiers + removed pointer alias in mergesort
Mike Becker <universe@uap-core.de>
parents: 37
diff changeset
50 cmp_func fnc, void* data) {
18
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
51 if (l1 == l2) return 1;
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
52
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
53 while (l1 != NULL && l2 != NULL) {
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
54 if (fnc == NULL) {
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
55 if (l1->data != l2->data) return 0;
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
56 } else {
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
57 if (fnc(l1->data, l2->data, data) != 0) return 0;
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
58 }
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
59 l1 = l1->next;
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
60 l2 = l2->next;
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
61 }
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
62
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
63 return (l1 == NULL && l2 == NULL);
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
64 }
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
65
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
66 void ucx_list_free(UcxList *l) {
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
67 ucx_list_free_a(ucx_default_allocator(), l);
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
68 }
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
69
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
70 void ucx_list_free_a(UcxAllocator *alloc, UcxList *l) {
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
71 UcxList *e = l, *f;
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
72 while (e != NULL) {
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
73 f = e;
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
74 e = e->next;
173
31a8682fffb7 fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents: 172
diff changeset
75 alfree(alloc, f);
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
76 }
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
77 }
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
78
212
c766c423dee6 fixed name of ucx_list_free_content()
Mike Becker <universe@uap-core.de>
parents: 211
diff changeset
79 void ucx_list_free_content(UcxList* list, ucx_destructor destr) {
277
f819fe5e20f5 makes destructor functions for *_free_content() optional + more documentation for UcxProperties
Mike Becker <universe@uap-core.de>
parents: 259
diff changeset
80 if (!destr) destr = free;
211
07a284486fa1 added ucx_list_free_contents()
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
81 while (list != NULL) {
07a284486fa1 added ucx_list_free_contents()
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
82 destr(list->data);
07a284486fa1 added ucx_list_free_contents()
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
83 list = list->next;
07a284486fa1 added ucx_list_free_contents()
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
84 }
07a284486fa1 added ucx_list_free_contents()
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
85 }
07a284486fa1 added ucx_list_free_contents()
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
86
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
87 UcxList *ucx_list_append(UcxList *l, void *data) {
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
88 return ucx_list_append_a(ucx_default_allocator(), l, data);
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
89 }
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
90
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
91 UcxList *ucx_list_append_a(UcxAllocator *alloc, UcxList *l, void *data) {
173
31a8682fffb7 fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents: 172
diff changeset
92 UcxList *nl = (UcxList*) almalloc(alloc, sizeof(UcxList));
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
93 if (!nl) {
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
94 return NULL;
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
95 }
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
96
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
97 nl->data = data;
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
98 nl->next = NULL;
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
99 if (l) {
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
100 UcxList *t = ucx_list_last(l);
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
101 t->next = nl;
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
102 nl->prev = t;
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
103 return l;
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
104 } else {
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
105 nl->prev = NULL;
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
106 return nl;
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
107 }
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
108 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
109
228
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
110 UcxList *ucx_list_append_once(UcxList *l, void *data,
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
111 cmp_func cmpfnc, void *cmpdata) {
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
112 return ucx_list_append_once_a(ucx_default_allocator(), l,
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
113 data, cmpfnc, cmpdata);
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
114 }
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
115
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
116 UcxList *ucx_list_append_once_a(UcxAllocator *alloc, UcxList *l, void *data,
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
117 cmp_func cmpfnc, void *cmpdata) {
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
118
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
119 UcxList *last = NULL;
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
120 {
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
121 UcxList *e = l;
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
122 while (e) {
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
123 if (cmpfnc(e->data, data, cmpdata) == 0) {
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
124 return l;
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
125 }
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
126 last = e;
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
127 e = e->next;
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
128 }
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
129 }
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
130
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
131 UcxList *nl = ucx_list_append_a(alloc, NULL, data);
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
132 if (!nl) {
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
133 return NULL;
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
134 }
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
135
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
136 if (last == NULL) {
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
137 return nl;
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
138 } else {
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
139 nl->prev = last;
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
140 last->next = nl;
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
141 return l;
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
142 }
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
143 }
9f385abc72fb adds ucx_list_append_once() and ucx_list_prepend_once()
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
144
291
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
145 UcxList *ucx_list_prepend_once(UcxList *l, void *data,
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
146 cmp_func cmpfnc, void *cmpdata) {
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
147 return ucx_list_prepend_once_a(ucx_default_allocator(), l,
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
148 data, cmpfnc, cmpdata);
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
149 }
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
150
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
151 UcxList *ucx_list_prepend_once_a(UcxAllocator *alloc, UcxList *l, void *data,
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
152 cmp_func cmpfnc, void *cmpdata) {
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
153
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
154 UcxList* first = ucx_list_first(l);
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
155 {
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
156 UcxList *e = first;
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
157 while (e) {
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
158 if (cmpfnc(e->data, data, cmpdata) == 0) {
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
159 return l;
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
160 }
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
161 e = e->next;
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
162 }
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
163 }
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
164
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
165 UcxList *nl = ucx_list_append_a(alloc, NULL, data);
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
166 if (!nl) {
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
167 return NULL;
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
168 }
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
169
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
170 if (first) {
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
171 nl->next = first;
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
172 first->prev = nl;
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
173 }
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
174
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
175 return nl;
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
176 }
deb0035635eb adds ucx_list_prepend_once() and ucx_list_prepend_once_a()
Mike Becker <universe@uap-core.de>
parents: 277
diff changeset
177
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
178 UcxList *ucx_list_prepend(UcxList *l, void *data) {
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
179 return ucx_list_prepend_a(ucx_default_allocator(), l, data);
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
180 }
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
181
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
182 UcxList *ucx_list_prepend_a(UcxAllocator *alloc, UcxList *l, void *data) {
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
183 UcxList *nl = ucx_list_append_a(alloc, NULL, data);
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
184 if (!nl) {
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
185 return NULL;
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
186 }
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
187 l = ucx_list_first(l);
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
188
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
189 if (l) {
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
190 nl->next = l;
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
191 l->prev = nl;
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
192 }
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
193 return nl;
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
194 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
195
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
196 UcxList *ucx_list_concat(UcxList *l1, UcxList *l2) {
128
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
197 if (l1) {
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
198 UcxList *last = ucx_list_last(l1);
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
199 last->next = l2;
172
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
200 if (l2) {
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
201 l2->prev = last;
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
202 }
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
203 return l1;
128
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
204 } else {
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
205 return l2;
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
206 }
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
207 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
208
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
209 UcxList *ucx_list_last(const UcxList *l) {
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
210 if (l == NULL) return NULL;
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
211
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
212 const UcxList *e = l;
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
213 while (e->next != NULL) {
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
214 e = e->next;
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
215 }
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
216 return (UcxList*)e;
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
217 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
218
123
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
219 ssize_t ucx_list_indexof(const UcxList *list, const UcxList *elem) {
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
220 ssize_t index = 0;
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
221 while (list) {
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
222 if (list == elem) {
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
223 return index;
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
224 }
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
225 list = list->next;
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
226 index++;
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
227 }
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
228 return -1;
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
229 }
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
230
172
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
231 UcxList *ucx_list_get(const UcxList *l, size_t index) {
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
232 if (l == NULL) return NULL;
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
233
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
234 const UcxList *e = l;
128
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
235 while (e->next && index > 0) {
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
236 e = e->next;
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
237 index--;
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
238 }
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
239
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
240 return (UcxList*)(index == 0 ? e : NULL);
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
241 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
242
123
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
243 ssize_t ucx_list_find(UcxList *l, void *elem, cmp_func fnc, void *cmpdata) {
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
244 ssize_t index = 0;
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
245 UCX_FOREACH(e, l) {
128
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
246 if (fnc) {
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
247 if (fnc(elem, e->data, cmpdata) == 0) {
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
248 return index;
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
249 }
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
250 } else {
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
251 if (elem == e->data) {
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
252 return index;
b79b1ce438dd finished documentation of UcxList
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
253 }
87
bd444539cced some fixes + ucx_(d)list_contains
Mike Becker <universe@uap-core.de>
parents: 73
diff changeset
254 }
123
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
255 index++;
87
bd444539cced some fixes + ucx_(d)list_contains
Mike Becker <universe@uap-core.de>
parents: 73
diff changeset
256 }
123
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
257 return -1;
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
258 }
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
259
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
260 int ucx_list_contains(UcxList *l, void *elem, cmp_func fnc, void *cmpdata) {
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
261 return ucx_list_find(l, elem, fnc, cmpdata) > -1;
87
bd444539cced some fixes + ucx_(d)list_contains
Mike Becker <universe@uap-core.de>
parents: 73
diff changeset
262 }
bd444539cced some fixes + ucx_(d)list_contains
Mike Becker <universe@uap-core.de>
parents: 73
diff changeset
263
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
264 size_t ucx_list_size(const UcxList *l) {
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
265 if (l == NULL) return 0;
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
266
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
267 const UcxList *e = l;
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
268 size_t s = 1;
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
269 while (e->next != NULL) {
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
270 e = e->next;
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
271 s++;
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
272 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
273
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
274 return s;
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
275 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
276
172
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
277 static UcxList *ucx_list_sort_merge(int length,
253
e19825a1430a removes unnecessary macros from ucx.h + removes the usage of restrict and _Bool completely, instead of defining macros
Mike Becker <universe@uap-core.de>
parents: 251
diff changeset
278 UcxList* ls, UcxList* le, UcxList* re,
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
279 cmp_func fnc, void* data) {
73
f15c7d6aebb9 lists now sort on heap to prevent stack overflows
Mike Becker <universe@uap-core.de>
parents: 69
diff changeset
280
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
281 UcxList** sorted = (UcxList**) malloc(sizeof(UcxList*)*length);
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
282 UcxList *rc, *lc;
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
283
67
27e67e725d35 added some qualifiers + removed pointer alias in mergesort
Mike Becker <universe@uap-core.de>
parents: 37
diff changeset
284 lc = ls; rc = le;
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
285 int n = 0;
67
27e67e725d35 added some qualifiers + removed pointer alias in mergesort
Mike Becker <universe@uap-core.de>
parents: 37
diff changeset
286 while (lc && lc != le && rc != re) {
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
287 if (fnc(lc->data, rc->data, data) <= 0) {
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
288 sorted[n] = lc;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
289 lc = lc->next;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
290 } else {
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
291 sorted[n] = rc;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
292 rc = rc->next;
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
293 }
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
294 n++;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
295 }
67
27e67e725d35 added some qualifiers + removed pointer alias in mergesort
Mike Becker <universe@uap-core.de>
parents: 37
diff changeset
296 while (lc && lc != le) {
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
297 sorted[n] = lc;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
298 lc = lc->next;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
299 n++;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
300 }
67
27e67e725d35 added some qualifiers + removed pointer alias in mergesort
Mike Becker <universe@uap-core.de>
parents: 37
diff changeset
301 while (rc && rc != re) {
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
302 sorted[n] = rc;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
303 rc = rc->next;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
304 n++;
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
305 }
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
306
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
307 // Update pointer
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
308 sorted[0]->prev = NULL;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
309 for (int i = 0 ; i < length-1 ; i++) {
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
310 sorted[i]->next = sorted[i+1];
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
311 sorted[i+1]->prev = sorted[i];
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
312 }
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
313 sorted[length-1]->next = NULL;
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
314
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
315 UcxList *ret = sorted[0];
73
f15c7d6aebb9 lists now sort on heap to prevent stack overflows
Mike Becker <universe@uap-core.de>
parents: 69
diff changeset
316 free(sorted);
69
fb59270b1de3 made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents: 67
diff changeset
317 return ret;
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
318 }
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
319
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
320 UcxList *ucx_list_sort(UcxList *l, cmp_func fnc, void *data) {
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
321 if (l == NULL) {
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
322 return NULL;
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
323 }
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
324
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
325 UcxList *lc;
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
326 int ln = 1;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
327
253
e19825a1430a removes unnecessary macros from ucx.h + removes the usage of restrict and _Bool completely, instead of defining macros
Mike Becker <universe@uap-core.de>
parents: 251
diff changeset
328 UcxList *ls = l, *le, *re;
172
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
329
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
330 // check how many elements are already sorted
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
331 lc = ls;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
332 while (lc->next != NULL && fnc(lc->next->data, lc->data, data) > 0) {
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
333 lc = lc->next;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
334 ln++;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
335 }
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
336 le = lc->next;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
337
67
27e67e725d35 added some qualifiers + removed pointer alias in mergesort
Mike Becker <universe@uap-core.de>
parents: 37
diff changeset
338 if (le == NULL) {
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
339 return l; // this list is already sorted :)
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
340 } else {
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
341 UcxList *rc;
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
342 int rn = 1;
67
27e67e725d35 added some qualifiers + removed pointer alias in mergesort
Mike Becker <universe@uap-core.de>
parents: 37
diff changeset
343 rc = le;
172
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
344 // skip already sorted elements
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
345 while (rc->next != NULL && fnc(rc->next->data, rc->data, data) > 0) {
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
346 rc = rc->next;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
347 rn++;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
348 }
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
349 re = rc->next;
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
350
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
351 // {ls,...,le->prev} and {rs,...,re->prev} are sorted - merge them
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
352 UcxList *sorted = ucx_list_sort_merge(ln+rn,
67
27e67e725d35 added some qualifiers + removed pointer alias in mergesort
Mike Becker <universe@uap-core.de>
parents: 37
diff changeset
353 ls, le, re,
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
354 fnc, data);
172
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
355
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
356 // Something left? Sort it!
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
357 size_t remainder_length = ucx_list_size(re);
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
358 if (remainder_length > 0) {
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
359 UcxList *remainder = ucx_list_sort(re, fnc, data);
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
360
172
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
361 // merge sorted list with (also sorted) remainder
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
362 l = ucx_list_sort_merge(ln+rn+remainder_length,
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
363 sorted, remainder, NULL, fnc, data);
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
364 } else {
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
365 // no remainder - we've got our sorted list
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
366 l = sorted;
7084e8e8433c refactoring of list tests + some bug fixes
Mike Becker <universe@uap-core.de>
parents: 161
diff changeset
367 }
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
368
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
369 return l;
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
370 }
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
371 }
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
372
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
373 UcxList *ucx_list_first(const UcxList *l) {
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
374 if (!l) {
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
375 return NULL;
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
376 }
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
377
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
378 const UcxList *e = l;
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
379 while (e->prev) {
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
380 e = e->prev;
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
381 }
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
382 return (UcxList *)e;
13
98ac89e3aa37 Added mempool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
383 }
22
76cdd8209f1f added ucx_dlist_remove and tests + fixed makefile error
Mike Becker <universe@uap-core.de>
parents: 18
diff changeset
384
122
540d99722f1f removal of single linked list implemenation - step 2: renamed UcxDlist to UcxList (new single implementation)
Mike Becker <universe@uap-core.de>
parents: 121
diff changeset
385 UcxList *ucx_list_remove(UcxList *l, UcxList *e) {
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
386 return ucx_list_remove_a(ucx_default_allocator(), l, e);
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
387 }
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
388
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
389 UcxList *ucx_list_remove_a(UcxAllocator *alloc, UcxList *l, UcxList *e) {
161
1031dd910f8e fixed ucx_list_remove crashing when removing the last element of a list
Mike Becker <universe@uap-core.de>
parents: 128
diff changeset
390 if (l == e) {
1031dd910f8e fixed ucx_list_remove crashing when removing the last element of a list
Mike Becker <universe@uap-core.de>
parents: 128
diff changeset
391 l = e->next;
1031dd910f8e fixed ucx_list_remove crashing when removing the last element of a list
Mike Becker <universe@uap-core.de>
parents: 128
diff changeset
392 }
1031dd910f8e fixed ucx_list_remove crashing when removing the last element of a list
Mike Becker <universe@uap-core.de>
parents: 128
diff changeset
393
1031dd910f8e fixed ucx_list_remove crashing when removing the last element of a list
Mike Becker <universe@uap-core.de>
parents: 128
diff changeset
394 if (e->next) {
22
76cdd8209f1f added ucx_dlist_remove and tests + fixed makefile error
Mike Becker <universe@uap-core.de>
parents: 18
diff changeset
395 e->next->prev = e->prev;
76cdd8209f1f added ucx_dlist_remove and tests + fixed makefile error
Mike Becker <universe@uap-core.de>
parents: 18
diff changeset
396 }
161
1031dd910f8e fixed ucx_list_remove crashing when removing the last element of a list
Mike Becker <universe@uap-core.de>
parents: 128
diff changeset
397
1031dd910f8e fixed ucx_list_remove crashing when removing the last element of a list
Mike Becker <universe@uap-core.de>
parents: 128
diff changeset
398 if (e->prev) {
1031dd910f8e fixed ucx_list_remove crashing when removing the last element of a list
Mike Becker <universe@uap-core.de>
parents: 128
diff changeset
399 e->prev->next = e->next;
1031dd910f8e fixed ucx_list_remove crashing when removing the last element of a list
Mike Becker <universe@uap-core.de>
parents: 128
diff changeset
400 }
1031dd910f8e fixed ucx_list_remove crashing when removing the last element of a list
Mike Becker <universe@uap-core.de>
parents: 128
diff changeset
401
173
31a8682fffb7 fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents: 172
diff changeset
402 alfree(alloc, e);
22
76cdd8209f1f added ucx_dlist_remove and tests + fixed makefile error
Mike Becker <universe@uap-core.de>
parents: 18
diff changeset
403 return l;
76cdd8209f1f added ucx_dlist_remove and tests + fixed makefile error
Mike Becker <universe@uap-core.de>
parents: 18
diff changeset
404 }

mercurial