CI: Use git master for xkeyboard-config on Linux

[platform/upstream/libxkbcommon.git] / src / darray.h

diff --git a/src/darray.h b/src/darray.h
index b6ad2cf..de659cc 100644 (file)
--- a/src/darray.h
+++ b/src/darray.h
@@ -23,10 +23,15 @@
 #ifndef CCAN_DARRAY_H
 #define CCAN_DARRAY_H
 
+/* Originally taken from: https://ccodearchive.net/info/darray.html
+ * But modified for libxkbcommon. */
+
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
+#include <limits.h>
 
-#define darray(type) struct { type *item; size_t size; size_t alloc; }
+#define darray(type) struct { type *item; unsigned size; unsigned alloc; }
 
 #define darray_new() { 0, 0, 0 }
 
@@ -39,6 +44,13 @@
     darray_init(arr); \
 } while (0)
 
+#define darray_steal(arr, to, to_size) do { \
+    *(to) = (arr).item; \
+    if (to_size) \
+        *(unsigned int *) (to_size) = (arr).size; \
+    darray_init(arr); \
+} while (0)
+
 /*
  * Typedefs for darrays of common types.  These are useful
  * when you want to pass a pointer to an darray(T) around.
@@ -73,7 +85,6 @@ typedef darray (unsigned long)  darray_ulong;
 #define darray_item(arr, i)     ((arr).item[i])
 #define darray_size(arr)        ((arr).size)
 #define darray_empty(arr)       ((arr).size == 0)
-#define darray_mem(arr, offset) ((arr).item + (offset))
 
 /*** Insertion (single item) ***/
 
@@ -85,20 +96,24 @@ typedef darray (unsigned long)  darray_ulong;
 /*** Insertion (multiple items) ***/
 
 #define darray_append_items(arr, items, count) do { \
-    size_t __count = (count), __oldSize = (arr).size; \
+    unsigned __count = (count), __oldSize = (arr).size; \
     darray_resize(arr, __oldSize + __count); \
     memcpy((arr).item + __oldSize, items, __count * sizeof(*(arr).item)); \
 } while (0)
 
 #define darray_from_items(arr, items, count) do { \
-    size_t __count = (count); \
+    unsigned __count = (count); \
     darray_resize(arr, __count); \
-    memcpy((arr).item, items, __count * sizeof(*(arr).item)); \
+    if (__count != 0) \
+        memcpy((arr).item, items, __count * sizeof(*(arr).item)); \
 } while (0)
 
 #define darray_copy(arr_to, arr_from) \
     darray_from_items((arr_to), (arr_from).item, (arr_from).size)
 
+#define darray_concat(arr_to, arr_from) \
+    darray_append_items((arr_to), (arr_from).item, (arr_from).size)
+
 /*** String buffer ***/
 
 #define darray_append_string(arr, str) do { \
@@ -113,14 +128,14 @@ typedef darray (unsigned long)  darray_ulong;
 } while (0)
 
 #define darray_appends_nullterminate(arr, items, count) do { \
-    size_t __count = (count), __oldSize = (arr).size; \
+    unsigned __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_prepends_nullterminate(arr, items, count) do { \
-    size_t __count = (count), __oldSize = (arr).size; \
+    unsigned __count = (count), __oldSize = (arr).size; \
     darray_resize(arr, __count + __oldSize + 1); \
     memmove((arr).item + __count, (arr).item, \
             __oldSize * sizeof(*(arr).item)); \
@@ -134,7 +149,7 @@ typedef darray (unsigned long)  darray_ulong;
     darray_growalloc(arr, (arr).size = (newSize))
 
 #define darray_resize0(arr, newSize) do { \
-    size_t __oldSize = (arr).size, __newSize = (newSize); \
+    unsigned __oldSize = (arr).size, __newSize = (newSize); \
     (arr).size = __newSize; \
     if (__newSize > __oldSize) { \
         darray_growalloc(arr, __newSize); \
@@ -149,14 +164,22 @@ typedef darray (unsigned long)  darray_ulong;
 } while (0)
 
 #define darray_growalloc(arr, need)   do { \
-    size_t __need = (need); \
+    unsigned __need = (need); \
     if (__need > (arr).alloc) \
-    darray_realloc(arr, darray_next_alloc((arr).alloc, __need)); \
+        darray_realloc(arr, darray_next_alloc((arr).alloc, __need, \
+                                              sizeof(*(arr).item))); \
+} while (0)
+
+#define darray_shrink(arr) do { \
+    if ((arr).size > 0) \
+        (arr).item = realloc((arr).item, \
+                             ((arr).alloc = (arr).size) * sizeof(*(arr).item)); \
 } while (0)
 
-static inline size_t
-darray_next_alloc(size_t alloc, size_t need)
+static inline unsigned
+darray_next_alloc(unsigned alloc, unsigned need, unsigned itemSize)
 {
+    assert(need < UINT_MAX / itemSize / 2); /* Overflow. */
     if (alloc == 0)
         alloc = 4;
     while (alloc < need)
@@ -184,6 +207,6 @@ darray_next_alloc(size_t alloc, size_t need)
          (idx)++, (val)++)
 
 #define darray_foreach_reverse(i, arr) \
-    for ((i) = &(arr).item[(arr).size]; (i)-- > &(arr).item[0]; )
+    for ((i) = &(arr).item[(arr).size - 1]; (arr).size > 0 && (i) >= &(arr).item[0]; (i)--)
 
 #endif /* CCAN_DARRAY_H */