Commit 18048cb7bf49468a9211e107c000ef255db2f94f
2012-08-02T17:59:57
darray: fix formatting Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323
diff --git a/src/darray.h b/src/darray.h
index 18f8959..c9b6094 100644
--- a/src/darray.h
+++ b/src/darray.h
@@ -25,7 +25,6 @@
#include <stdlib.h>
#include <string.h>
-#include "config.h"
/*
* SYNOPSIS
@@ -39,12 +38,6 @@
* darray_init(foo.a);
* darray_free(foo.a);
*
- * const struct {
- * darray(int) a;
- * } foo = {
- * .a = darray_lit({1, 2, 3})
- * };
- *
* Typedefs for darrays of common types:
*
* darray_char, darray_schar, darray_uchar
@@ -76,10 +69,6 @@
* void darray_appends(darray(T) arr, [T item, [...]]);
* void darray_prepends(darray(T) arr, [T item, [...]]);
*
- * // Same functionality as above, but does not require typeof.
- * void darray_appends_t(darray(T) arr, #T, [T item, [...]]);
- * void darray_prepends_t(darray(T) arr, #T, [T item, [...]]);
- *
* Removal:
*
* T darray_pop(darray(T) arr | darray_size(arr) != 0);
@@ -109,8 +98,6 @@
* void darray_realloc(darray(T) arr, size_t newAlloc);
* void darray_growalloc(darray(T) arr, size_t newAlloc);
*
- * void darray_make_room(darray(T) arr, size_t room);
- *
* Traversal:
*
* darray_foreach(T *&i, darray(T) arr) {...}
@@ -122,16 +109,17 @@
/*** Life cycle ***/
-#define darray(type) struct { type *item; size_t size; size_t alloc; }
+#define darray(type) struct { type *item; size_t size; size_t alloc; }
-#define darray_new() { 0, 0, 0 }
-#define darray_init(arr) do { (arr).item = 0; (arr).size = 0; (arr).alloc = 0; \
+#define darray_new() { 0, 0, 0 }
+
+#define darray_init(arr) do { \
+ (arr).item = 0; (arr).size = 0; (arr).alloc = 0; \
} while (0)
-#define darray_free(arr) do { free((arr).item); darray_init(arr); } while (0)
-/* Only use for immutable darray - e.g. for static const initialzers. */
-#define darray_lit(c_array) { (c_array), sizeof(c_array) / sizeof(*(c_array)), \
- 0 }
+#define darray_free(arr) do { \
+ free((arr).item); darray_init(arr); \
+} while (0)
/*
* Typedefs for darrays of common types. These are useful
@@ -175,151 +163,146 @@ typedef darray (unsigned long) darray_ulong;
/*** Insertion (single item) ***/
#define darray_append(arr, ...) do { \
- darray_resize(arr, (arr).size + 1); \
- (arr).item[(arr).size - 1] = (__VA_ARGS__); \
+ darray_resize(arr, (arr).size + 1); \
+ (arr).item[(arr).size - 1] = (__VA_ARGS__); \
} while (0)
+
#define darray_prepend(arr, ...) do { \
- darray_resize(arr, (arr).size + 1); \
- memmove((arr).item + 1, (arr).item, \
- ((arr).size - 1) * sizeof(*(arr).item)); \
- (arr).item[0] = (__VA_ARGS__); \
+ darray_resize(arr, (arr).size + 1); \
+ memmove((arr).item + 1, (arr).item, \
+ ((arr).size - 1) * sizeof(*(arr).item)); \
+ (arr).item[0] = (__VA_ARGS__); \
} while (0)
-#define darray_push(arr, ...) darray_append(arr, __VA_ARGS__)
+
+#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)); \
+#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)); \
} 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)); \
+#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)); \
} 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)); \
- (arr).item[--(arr).size] = 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)); \
+ (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)); \
- (arr).item[--(arr).size] = 0; \
+ 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)
-#if HAVE_TYPEOF
-#define darray_appends(arr, ...) darray_appends_t(arr, typeof((*(arr).item)), \
- __VA_ARGS__)
-#define darray_prepends(arr, ...) darray_prepends_t(arr, typeof((*(arr).item)), \
- __VA_ARGS__)
-#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)
+#define darray_appends(arr, ...) \
+ darray_appends_t(arr, typeof((*(arr).item)), __VA_ARGS__)
+
+#define darray_prepends(arr, ...) \
+ darray_prepends_t(arr, typeof((*(arr).item)), __VA_ARGS__)
+
/*** Removal ***/
/* Warning: Do not call darray_pop on an empty darray. */
-#define darray_pop(arr) ((arr).item[--(arr).size])
+#define darray_pop(arr) ((arr).item[--(arr).size])
#define darray_pop_check(arr) ((arr).size ? darray_pop(arr) : NULL)
/*** 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)); \
+#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)))
-#define darray_copy(arr_to, arr_from) darray_from_items( \
- arr_to, \
- (arr_from). \
- item, (arr_from).size)
+
+#define darray_from_c(arr, c_array) \
+ darray_from_items(arr, c_array, sizeof(c_array) / sizeof(*(c_array)))
+
+#define darray_copy(arr_to, arr_from) \
+ darray_from_items((arr_to), (arr_from).item, (arr_from).size)
/*** String buffer ***/
-#define darray_append_string(arr, str) do { const char *__str = (str); \
- darray_append_items( \
- arr, __str, \
- strlen(__str) + 1); \
- (arr).size--; \
+#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)); \
+
+#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)); \
} 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--; \
+#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)
-#define darray_from_lit(arr, stringLiteral) do { darray_from_items( \
- arr, stringLiteral, \
- sizeof(stringLiteral)); \
- (arr).size--; } while (0)
/*** Size management ***/
-#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)); \
- } \
+#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)); \
+ } \
} while (0)
#define darray_realloc(arr, newAlloc) do { \
- (arr).item = \
- realloc((arr).item, ((arr).alloc = (newAlloc)) * \
- sizeof(*(arr).item)); \
+ (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
-#define darray_make_room(arr, \
- room) ({ size_t newAlloc = (arr).size + (room); \
- if ((arr).alloc < \
- newAlloc) darray_realloc(arr, newAlloc); \
- (arr).item + (arr).size; })
-#endif
-
static inline size_t
darray_next_alloc(size_t alloc, size_t need)
{
@@ -341,7 +324,7 @@ darray_next_alloc(size_t alloc, size_t need)
for ((i) = &(arr).item[0]; (i) < &(arr).item[(arr).size]; (i)++)
#define darray_foreach_from(i, arr, from) \
- for ((i) = &(arr).item[from]; (i) < &(arr).item[(arr).size]; (i)++)
+ for ((i) = &(arr).item[from]; (i) < &(arr).item[(arr).size]; (i)++)
/*
* darray_foreach_reverse(T *&i, darray(T) arr) {...}