From 59c950a08f70aaa9151a5442abe1da61d072373a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= Date: Sat, 2 Dec 2017 12:38:35 +0100 Subject: [PATCH] [hkl] updated ccan --- hkl/ccan/Makefile.am | 34 +++++++++++----------- hkl/ccan/configurator.c | 2 ++ hkl/ccan/darray/darray.h | 76 ++++++++++++++++++++++++++---------------------- 3 files changed, 61 insertions(+), 51 deletions(-) diff --git a/hkl/ccan/Makefile.am b/hkl/ccan/Makefile.am index 3265a1b0..8a5582a9 100644 --- a/hkl/ccan/Makefile.am +++ b/hkl/ccan/Makefile.am @@ -7,32 +7,32 @@ ccan_config.h: configurator noinst_LTLIBRARIES=libccan.la libccan_la_SOURCES = \ ccan_config.h \ - list/list.h \ - list/list.c \ - noerr/noerr.h \ + array_size/array_size.h \ noerr/noerr.c \ - darray/darray.h \ - container_of/container_of.h \ - typesafe_cb/typesafe_cb.h \ - str/str_debug.h \ + noerr/noerr.h \ + check_type/check_type.h \ str/str.h \ + str/str_debug.h \ str/str.c \ str/debug.c \ - ptrint/ptrint.h \ generator/generator.h \ generator/generator.c \ + darray/darray.h \ + coroutine/coroutine.h \ + coroutine/coroutine.c \ cppmagic/cppmagic.h \ - check_type/check_type.h \ - array_size/array_size.h \ - ptr_valid/ptr_valid.h \ - ptr_valid/ptr_valid.c \ - autodata/autodata.c \ + compiler/compiler.h \ autodata/autodata.h \ - alignof/alignof.h \ + autodata/autodata.c \ + container_of/container_of.h \ build_assert/build_assert.h \ - compiler/compiler.h \ - coroutine/coroutine.c \ - coroutine/coroutine.h + typesafe_cb/typesafe_cb.h \ + list/list.c \ + list/list.h \ + alignof/alignof.h \ + ptr_valid/ptr_valid.c \ + ptr_valid/ptr_valid.h \ + ptrint/ptrint.h ccanincludedir=$(includedir)/hkl-@VMAJ@/hkl/ccan nobase_ccaninclude_HEADERS= \ diff --git a/hkl/ccan/configurator.c b/hkl/ccan/configurator.c index 6ec30bd6..52c0243b 100644 --- a/hkl/ccan/configurator.c +++ b/hkl/ccan/configurator.c @@ -315,6 +315,8 @@ static struct test tests[] = { "#include \n" }, { "HAVE_SYS_TERMIOS_H", OUTSIDE_MAIN, NULL, NULL, "#include \n" }, + { "HAVE_SYS_UNISTD_H", OUTSIDE_MAIN, NULL, NULL, + "#include \n" }, { "HAVE_TYPEOF", INSIDE_MAIN, NULL, NULL, "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" }, { "HAVE_UNALIGNED_ACCESS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL, diff --git a/hkl/ccan/darray/darray.h b/hkl/ccan/darray/darray.h index 12a49909..384ff3c2 100644 --- a/hkl/ccan/darray/darray.h +++ b/hkl/ccan/darray/darray.h @@ -56,6 +56,7 @@ * * void darray_append(darray(T) arr, T item); * void darray_prepend(darray(T) arr, T item); + * void darray_insert(darray(T) arr, size_t index, T item); * void darray_push(darray(T) arr, T item); // same as darray_append * * Insertion (multiple items): @@ -169,36 +170,42 @@ typedef darray(unsigned long) darray_ulong; memmove((arr).item+1, (arr).item, ((arr).size-1)*sizeof(*(arr).item)); \ (arr).item[0] = (__VA_ARGS__); \ } while(0) +#define darray_insert(arr, i, ...) do { \ + size_t index_ = (i); \ + darray_resize(arr, (arr).size+1); \ + memmove((arr).item+index_+1, (arr).item+index_, ((arr).size-index_-1)*sizeof(*(arr).item)); \ + (arr).item[index_] = (__VA_ARGS__); \ + } while(0) #define darray_push(arr, ...) darray_append(arr, __VA_ARGS__) /*** Insertion (multiple items) ***/ #define darray_append_items(arr, items, count) do { \ - size_t __count = (count), __oldSize = (arr).size; \ - darray_resize(arr, __oldSize + __count); \ - memcpy((arr).item + __oldSize, items, __count * sizeof(*(arr).item)); \ + size_t count_ = (count), oldSize_ = (arr).size; \ + darray_resize(arr, oldSize_ + count_); \ + memcpy((arr).item + oldSize_, items, count_ * sizeof(*(arr).item)); \ } while(0) #define darray_prepend_items(arr, items, count) do { \ - size_t __count = (count), __oldSize = (arr).size; \ - darray_resize(arr, __count + __oldSize); \ - memmove((arr).item + __count, (arr).item, __oldSize * sizeof(*(arr).item)); \ - memcpy((arr).item, items, __count * sizeof(*(arr).item)); \ + size_t count_ = (count), oldSize_ = (arr).size; \ + darray_resize(arr, count_ + oldSize_); \ + memmove((arr).item + count_, (arr).item, oldSize_ * sizeof(*(arr).item)); \ + memcpy((arr).item, items, count_ * sizeof(*(arr).item)); \ } while(0) #define darray_append_items_nullterminate(arr, items, count) do { \ - size_t __count = (count), __oldSize = (arr).size; \ - darray_resize(arr, __oldSize + __count + 1); \ - memcpy((arr).item + __oldSize, items, __count * sizeof(*(arr).item)); \ + size_t count_ = (count), oldSize_ = (arr).size; \ + darray_resize(arr, oldSize_ + count_ + 1); \ + memcpy((arr).item + oldSize_, items, count_ * sizeof(*(arr).item)); \ (arr).item[--(arr).size] = 0; \ } while(0) #define darray_prepend_items_nullterminate(arr, items, count) do { \ - size_t __count = (count), __oldSize = (arr).size; \ - darray_resize(arr, __count + __oldSize + 1); \ - memmove((arr).item + __count, (arr).item, __oldSize * sizeof(*(arr).item)); \ - memcpy((arr).item, items, __count * sizeof(*(arr).item)); \ + size_t count_ = (count), oldSize_ = (arr).size; \ + darray_resize(arr, count_ + oldSize_ + 1); \ + memmove((arr).item + count_, (arr).item, oldSize_ * sizeof(*(arr).item)); \ + memcpy((arr).item, items, count_ * sizeof(*(arr).item)); \ (arr).item[--(arr).size] = 0; \ } while(0) @@ -208,12 +215,12 @@ typedef darray(unsigned long) darray_ulong; #endif #define darray_appends_t(arr, type, ...) do { \ - type __src[] = {__VA_ARGS__}; \ - darray_append_items(arr, __src, sizeof(__src)/sizeof(*__src)); \ + type src_[] = {__VA_ARGS__}; \ + darray_append_items(arr, src_, sizeof(src_)/sizeof(*src_)); \ } while(0) #define darray_prepends_t(arr, type, ...) do { \ - type __src[] = {__VA_ARGS__}; \ - darray_prepend_items(arr, __src, sizeof(__src)/sizeof(*__src)); \ + type src_[] = {__VA_ARGS__}; \ + darray_prepend_items(arr, src_, sizeof(src_)/sizeof(*src_)); \ } while(0) @@ -223,32 +230,33 @@ typedef darray(unsigned long) darray_ulong; #define darray_pop(arr) ((arr).item[--(arr).size]) #define darray_pop_check(arr) ((arr).size ? darray_pop(arr) : NULL) /* Warning, slow: Requires copying all elements after removed item. */ -#define darray_remove(arr, index) do { \ - if (index < arr.size-1) \ - memmove(&(arr).item[index], &(arr).item[index+1], ((arr).size-1-i)*sizeof(*(arr).item)); \ +#define darray_remove(arr, i) do { \ + size_t index_ = (i); \ + if (index_ < arr.size-1) \ + memmove(&(arr).item[index_], &(arr).item[index_+1], ((arr).size-1-index_)*sizeof(*(arr).item)); \ (arr).size--; \ } while(0) /*** Replacement ***/ -#define darray_from_items(arr, items, count) do {size_t __count = (count); darray_resize(arr, __count); memcpy((arr).item, items, __count*sizeof(*(arr).item));} while(0) +#define darray_from_items(arr, items, count) do {size_t count_ = (count); darray_resize(arr, count_); memcpy((arr).item, items, count_*sizeof(*(arr).item));} while(0) #define darray_from_c(arr, c_array) darray_from_items(arr, c_array, sizeof(c_array)/sizeof(*(c_array))) /*** String buffer ***/ -#define darray_append_string(arr, str) do {const char *__str = (str); darray_append_items(arr, __str, strlen(__str)+1); (arr).size--;} while(0) +#define darray_append_string(arr, str) do {const char *str_ = (str); darray_append_items(arr, str_, strlen(str_)+1); (arr).size--;} while(0) #define darray_append_lit(arr, stringLiteral) do {darray_append_items(arr, stringLiteral, sizeof(stringLiteral)); (arr).size--;} while(0) #define darray_prepend_string(arr, str) do { \ - const char *__str = (str); \ - darray_prepend_items_nullterminate(arr, __str, strlen(__str)); \ + const char *str_ = (str); \ + darray_prepend_items_nullterminate(arr, str_, strlen(str_)); \ } while(0) #define darray_prepend_lit(arr, stringLiteral) \ darray_prepend_items_nullterminate(arr, stringLiteral, sizeof(stringLiteral) - 1) -#define darray_from_string(arr, str) do {const char *__str = (str); darray_from_items(arr, __str, strlen(__str)+1); (arr).size--;} while(0) +#define darray_from_string(arr, str) do {const char *str_ = (str); darray_from_items(arr, str_, strlen(str_)+1); (arr).size--;} while(0) #define darray_from_lit(arr, stringLiteral) do {darray_from_items(arr, stringLiteral, sizeof(stringLiteral)); (arr).size--;} while(0) @@ -256,11 +264,11 @@ typedef darray(unsigned long) darray_ulong; #define darray_resize(arr, newSize) darray_growalloc(arr, (arr).size = (newSize)) #define darray_resize0(arr, newSize) do { \ - size_t __oldSize = (arr).size, __newSize = (newSize); \ - (arr).size = __newSize; \ - if (__newSize > __oldSize) { \ - darray_growalloc(arr, __newSize); \ - memset(&(arr).item[__oldSize], 0, (__newSize - __oldSize) * sizeof(*(arr).item)); \ + size_t oldSize_ = (arr).size, newSize_ = (newSize); \ + (arr).size = newSize_; \ + if (newSize_ > oldSize_) { \ + darray_growalloc(arr, newSize_); \ + memset(&(arr).item[oldSize_], 0, (newSize_ - oldSize_) * sizeof(*(arr).item)); \ } \ } while(0) @@ -268,9 +276,9 @@ typedef darray(unsigned long) darray_ulong; (arr).item = realloc((arr).item, ((arr).alloc = (newAlloc)) * sizeof(*(arr).item)); \ } while(0) #define darray_growalloc(arr, need) do { \ - size_t __need = (need); \ - if (__need > (arr).alloc) \ - darray_realloc(arr, darray_next_alloc((arr).alloc, __need)); \ + size_t need_ = (need); \ + if (need_ > (arr).alloc) \ + darray_realloc(arr, darray_next_alloc((arr).alloc, need_)); \ } while(0) #if HAVE_STATEMENT_EXPR==1 -- 2.11.4.GIT