From 93f9023b46c1c33c59e978acd305dfd015bc0df3 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 19 May 2014 09:17:27 -0400 Subject: Merge klib upstream. Silence -Wstrict-prototypes and static analyser warnings Using "(void)" provides an explicit there-are-no-arguments prototype. Using the exact type in "malloc(...sizeof)" is clearer and silences warnings from clang's static analyzer. (John Marshall) --- src/nvim/lib/klist.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/nvim/lib/klist.h b/src/nvim/lib/klist.h index 65f87ed5e3..07fd872e1a 100644 --- a/src/nvim/lib/klist.h +++ b/src/nvim/lib/klist.h @@ -37,7 +37,7 @@ size_t cnt, n, max; \ kmptype_t **buf; \ } kmp_##name##_t; \ - static inline kmp_##name##_t *kmp_init_##name() { \ + static inline kmp_##name##_t *kmp_init_##name(void) { \ return xcalloc(1, sizeof(kmp_##name##_t)); \ } \ static inline void kmp_destroy_##name(kmp_##name##_t *mp) { \ @@ -56,7 +56,7 @@ --mp->cnt; \ if (mp->n == mp->max) { \ mp->max = mp->max? mp->max<<1 : 16; \ - mp->buf = xrealloc(mp->buf, sizeof(void*) * mp->max); \ + mp->buf = xrealloc(mp->buf, sizeof(kmptype_t *) * mp->max); \ } \ mp->buf[mp->n++] = p; \ } @@ -79,7 +79,7 @@ kmp_##name##_t *mp; \ size_t size; \ } kl_##name##_t; \ - static inline kl_##name##_t *kl_init_##name() { \ + static inline kl_##name##_t *kl_init_##name(void) { \ kl_##name##_t *kl = xcalloc(1, sizeof(kl_##name##_t)); \ kl->mp = kmp_init(name); \ kl->head = kl->tail = kmp_alloc(name, kl->mp); \ -- cgit