summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-19 21:42:49 +0200
committerwm4 <wm4@nowhere>2013-10-19 21:43:08 +0200
commitd2d0bc31bf3c982254a296cc869a1b7c394addb6 (patch)
treea2aa076a8fb278ae5b3476c5046ac8ee52fda898
parentd7287d60dd726c628dcecbb578d10d17f4e45cc2 (diff)
downloadmpv-d2d0bc31bf3c982254a296cc869a1b7c394addb6.tar.bz2
mpv-d2d0bc31bf3c982254a296cc869a1b7c394addb6.tar.xz
mp_talloc: simplify a bit
Implement MP_GROW_ARRAY using MP_TARRAY_GROW. MP_GROW_ARRAY is basically the earlier version of MP_TARRAY_GROW, and had different semantics. When I added MP_TARRAY_GROW, I didn't dare to change it, but I think all code that relied on the exact semantics of MP_GROW_ARRAY is gone now, or the difference doesn't matter anyway. The semantic change is that now (n+1)*2 elements are preallocated instead of n*2. Also, implement MP_TARRAY_GROW using MP_RESIZE_ARRAY, which saves 1 line of code. In future, these macros should be part of TA.
-rw-r--r--mpvcore/mp_talloc.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/mpvcore/mp_talloc.h b/mpvcore/mp_talloc.h
index 1dcb0bce07..eb62a21109 100644
--- a/mpvcore/mp_talloc.h
+++ b/mpvcore/mp_talloc.h
@@ -23,21 +23,19 @@
#include "compat/compiler.h"
#define MP_TALLOC_ELEMS(p) (talloc_get_size(p) / sizeof((p)[0]))
-#define MP_GROW_ARRAY(p, nextidx) do { \
- if ((nextidx) == MP_TALLOC_ELEMS(p)) \
- (p) = talloc_realloc_size(NULL, p, talloc_get_size(p) * 2); } while (0)
-#define MP_RESIZE_ARRAY(ctx, p, count) do { \
+
+#define MP_RESIZE_ARRAY(ctx, p, count) do { \
(p) = talloc_realloc_size((ctx), p, (count) * sizeof((p)[0])); } while (0)
#define MP_TARRAY_GROW(ctx, p, nextidx) \
do { \
size_t nextidx_ = (nextidx); \
- size_t nelems_ = MP_TALLOC_ELEMS(p); \
- if (nextidx_ >= nelems_) \
- (p) = talloc_realloc_size(ctx, p, \
- (nextidx_ + 1) * sizeof((p)[0]) * 2);\
+ if (nextidx_ >= MP_TALLOC_ELEMS(p)) \
+ MP_RESIZE_ARRAY(ctx, p, (nextidx_ + 1) * 2);\
} while (0)
+#define MP_GROW_ARRAY(p, nextidx) MP_TARRAY_GROW(NULL, p, nextidx)
+
#define MP_TARRAY_APPEND(ctx, p, idxvar, ...) \
do { \
MP_TARRAY_GROW(ctx, p, idxvar); \