aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/lib
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2016-06-10 22:35:18 +0300
committerZyX <kp-pav@yandex.ru>2016-06-11 00:08:58 +0300
commit739f066afee351ebb96a5f14a2721c9d78ab92c4 (patch)
tree5221d54354932400e94d4628183e1be8a3d37084 /src/nvim/lib
parentd359bb3f60cfb2eea7973081797841e69aeeb78c (diff)
downloadrneovim-739f066afee351ebb96a5f14a2721c9d78ab92c4.tar.gz
rneovim-739f066afee351ebb96a5f14a2721c9d78ab92c4.tar.bz2
rneovim-739f066afee351ebb96a5f14a2721c9d78ab92c4.zip
*: Also fix the adjacent errors
Diffstat (limited to 'src/nvim/lib')
-rw-r--r--src/nvim/lib/klist.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/src/nvim/lib/klist.h b/src/nvim/lib/klist.h
index ae9d56f19f..7ee100ab8c 100644
--- a/src/nvim/lib/klist.h
+++ b/src/nvim/lib/klist.h
@@ -45,20 +45,22 @@
REAL_FATTR_UNUSED; \
static inline void kmp_destroy_##name(kmp_##name##_t *mp) { \
size_t k; \
- for (k = 0; k < mp->n; ++k) { \
+ for (k = 0; k < mp->n; k++) { \
kmpfree_f(mp->buf[k]); xfree(mp->buf[k]); \
} \
xfree(mp->buf); xfree(mp); \
} \
static inline kmptype_t *kmp_alloc_##name(kmp_##name##_t *mp) { \
- ++mp->cnt; \
- if (mp->n == 0) return xcalloc(1, sizeof(kmptype_t)); \
+ mp->cnt++; \
+ if (mp->n == 0) { \
+ return xcalloc(1, sizeof(kmptype_t)); \
+ } \
return mp->buf[--mp->n]; \
} \
static inline void kmp_free_##name(kmp_##name##_t *mp, kmptype_t *p) { \
- --mp->cnt; \
+ mp->cnt--; \
if (mp->n == mp->max) { \
- mp->max = mp->max? mp->max<<1 : 16; \
+ mp->max = mp->max ? (mp->max << 1) : 16; \
mp->buf = xrealloc(mp->buf, sizeof(kmptype_t *) * mp->max); \
} \
mp->buf[mp->n++] = p; \
@@ -93,8 +95,9 @@
REAL_FATTR_UNUSED; \
static inline void kl_destroy_##name(kl_##name##_t *kl) { \
kl1_##name *p; \
- for (p = kl->head; p != kl->tail; p = p->next) \
+ for (p = kl->head; p != kl->tail; p = p->next) { \
kmp_free(name, kl->mp, p); \
+ } \
kmp_free(name, kl->mp, p); \
kmp_destroy(name, kl->mp); \
xfree(kl); \
@@ -102,22 +105,23 @@
static inline void kl_push_##name(kl_##name##_t *kl, kltype_t d) { \
kl1_##name *q, *p = kmp_alloc(name, kl->mp); \
q = kl->tail; p->next = 0; kl->tail->next = p; kl->tail = p; \
- ++kl->size; \
+ kl->size++; \
q->data = d; \
} \
static inline kltype_t kl_shift_at_##name(kl_##name##_t *kl, \
kl1_##name **n) { \
assert((*n)->next); \
kl1_##name *p; \
- --kl->size; \
+ kl->size--; \
p = *n; \
*n = (*n)->next; \
- if (p == kl->head) kl->head = *n; \
+ if (p == kl->head) { \
+ kl->head = *n; \
+ } \
kltype_t d = p->data; \
kmp_free(name, kl->mp, p); \
return d; \
- } \
-
+ }
#define kliter_t(name) kl1_##name
#define klist_t(name) kl_##name##_t