Werner's Miscellanea
Sign in or create your account | Project List | Help
Werner's Miscellanea Commit Details
Date: | 2010-11-19 23:52:39 (13 years 4 months ago) |
---|---|
Author: | Werner Almesberger |
Commit: | cc92c670802bb7f7a0789777f86f0c3f00706216 |
Message: | qpkg: (jrb) remove _gen suffix, since we removed the non-generic
variants - jrb.h, jrb.c (jrb_find_gte_gen): renamed to jrb_find_gte - jrb.h, jrb.c (jrb_find_gen): renamed to jrb_find - jrb.h, jrb.c (jrb_insert_gen): renamed to jrb_insert - rbtest.c (INSERT): track jrb_insert_gen name change |
Files: |
qpkg/jrb.c (3 diffs) qpkg/jrb.h (1 diff) qpkg/rbtest.c (1 diff) |
Change Details
qpkg/jrb.c | ||
---|---|---|
165 | 165 | return head; |
166 | 166 | } |
167 | 167 | |
168 | JRB jrb_find_gte_gen(JRB n, const void *key, | |
168 | JRB jrb_find_gte(JRB n, const void *key, | |
169 | 169 | int (*fxn)(const void *, const void *), int *fnd) |
170 | 170 | { |
171 | 171 | int cmp; |
... | ... | |
194 | 194 | } |
195 | 195 | } |
196 | 196 | |
197 | JRB jrb_find_gen(JRB n, const void *key, int (*fxn)(const void *, const void *)) | |
197 | JRB jrb_find(JRB n, const void *key, int (*fxn)(const void *, const void *)) | |
198 | 198 | { |
199 | 199 | int fnd; |
200 | 200 | JRB j; |
201 | 201 | |
202 | j = jrb_find_gte_gen(n, key, fxn, &fnd); | |
202 | j = jrb_find_gte(n, key, fxn, &fnd); | |
203 | 203 | if (fnd) return j; else return NULL; |
204 | 204 | } |
205 | 205 | |
... | ... | |
494 | 494 | return n->val; |
495 | 495 | } |
496 | 496 | |
497 | JRB jrb_insert_gen(JRB tree, void *key, void *val, | |
497 | JRB jrb_insert(JRB tree, void *key, void *val, | |
498 | 498 | int (*func)(const void *, const void *)) |
499 | 499 | { |
500 | 500 | int fnd; |
501 | 501 | |
502 | return jrb_insert_b(jrb_find_gte_gen(tree, key, func, &fnd), key, val); | |
502 | return jrb_insert_b(jrb_find_gte(tree, key, func, &fnd), key, val); | |
503 | 503 | } |
qpkg/jrb.h | ||
---|---|---|
65 | 65 | jrb_insert uses strcmp() as comparison funcion. jrb_inserti uses <>=, |
66 | 66 | jrb_insertg uses func() */ |
67 | 67 | |
68 | extern JRB jrb_insert_gen(JRB tree, void *key, void *val, | |
68 | extern JRB jrb_insert(JRB tree, void *key, void *val, | |
69 | 69 | int (*func)(const void *, const void *)); |
70 | 70 | |
71 | 71 | /* returns an external node in t whose value is equal k. Returns NULL if |
72 | 72 | there is no such node in the tree */ |
73 | 73 | |
74 | extern JRB jrb_find_gen(JRB root, const void *, | |
74 | extern JRB jrb_find(JRB root, const void *, | |
75 | 75 | int (*func)(const void *, const void *)); |
76 | 76 | |
77 | 77 | /* returns an external node in t whose value is equal |
78 | 78 | k or whose value is the smallest value greater than k. Sets found to |
79 | 79 | 1 if the key was found, and 0 otherwise. */ |
80 | 80 | |
81 | extern JRB jrb_find_gte_gen(JRB root, const void *key, | |
81 | extern JRB jrb_find_gte(JRB root, const void *key, | |
82 | 82 | int (*func)(const void *, const void *), int *found); |
83 | 83 | |
84 | 84 |
qpkg/rbtest.c | ||
---|---|---|
12 | 12 | |
13 | 13 | |
14 | 14 | #define INSERT(key, val) \ |
15 | jrb_insert_gen(tree, key, val, cmp) | |
15 | jrb_insert(tree, key, val, cmp) | |
16 | 16 | |
17 | 17 | |
18 | 18 | int main(void) |
Branches:
master