From 9592bfd0dda7c575de07bce2c7a81b8432d845a4 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 28 Jul 2021 23:45:20 +0000 Subject: Huge incompatible changes. - Obsolete skalibs/environ.h and skalibs/getpeereid.h removed. - rc4 and md5 removed. - All *_t types renamed to avoid treading on POSIX namespace. - subgetopt() renamed to lgetopt(). - signal functions reworked; skasigaction removed; sig_stack removed - Various functions removed: skaoffsetof(), selfpipe_untrap() - New posixplz function: munmap_void. Signed-off-by: Laurent Bercot --- src/libdatastruct/bigkv_fill.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/libdatastruct/bigkv_fill.c') diff --git a/src/libdatastruct/bigkv_fill.c b/src/libdatastruct/bigkv_fill.c index 06747c6..249a300 100644 --- a/src/libdatastruct/bigkv_fill.c +++ b/src/libdatastruct/bigkv_fill.c @@ -12,8 +12,8 @@ static void *bigkv_dtok (uint32_t d, void *p) { - bigkv_t *b = p ; - return b->storage.s + genalloc_s(bigkv_node_t, &b->nodes)[d].k ; + bigkv *b = p ; + return b->storage.s + genalloc_s(bigkv_node, &b->nodes)[d].k ; } static int bigkv_cmp (void const *a, void const *b, void *p) @@ -22,14 +22,14 @@ static int bigkv_cmp (void const *a, void const *b, void *p) return strcmp((char const *)a, (char const *)b) ; } -int bigkv_fill (bigkv_t *b, char const *const *argv, char delim, char const *prefix, char const *stop, uint32_t options) +int bigkv_fill (bigkv *b, char const *const *argv, char delim, char const *prefix, char const *stop, uint32_t options) { int i = 0 ; size_t prefixlen = prefix ? strlen(prefix) : 0 ; avltree_init(&b->map, 3, 3, 8, &bigkv_dtok, &bigkv_cmp, b) ; for (; argv[i] && !(stop && !strcmp(argv[i], stop)) ; i++) { - bigkv_node_t node = { .k = b->storage.len } ; + bigkv_node node = { .k = b->storage.len } ; char const *s = argv[i] ; size_t len = strlen(s) ; size_t pos ; @@ -56,11 +56,11 @@ int bigkv_fill (bigkv_t *b, char const *const *argv, char delim, char const *pre if (!stralloc_catb(&b->storage, s + pos + 1, len - pos)) goto err ; } else node.v = b->storage.len - 1 ; - if (isdup) genalloc_s(bigkv_node_t, &b->nodes)[d].v = node.v ; + if (isdup) genalloc_s(bigkv_node, &b->nodes)[d].v = node.v ; else { - d = genalloc_len(bigkv_node_t, &b->nodes) ; - if (!genalloc_append(bigkv_node_t, &b->nodes, &node)) goto err ; + d = genalloc_len(bigkv_node, &b->nodes) ; + if (!genalloc_append(bigkv_node, &b->nodes, &node)) goto err ; if (!avltree_insert(&b->map, d)) goto err ; } } -- cgit v1.2.3