From ac0353b15af451648b0610655191fb8f06f9f45d Mon Sep 17 00:00:00 2001
From: Arne Goedeke <el@laramies.com>
Date: Wed, 2 Jul 2014 19:09:15 +0200
Subject: [PATCH] block_allocator: removed some INLINE and warnings for unused
parameters
---
src/block_allocator.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/block_allocator.c b/src/block_allocator.c
index 1ed9160592..59f13024b8 100644
--- a/src/block_allocator.c
+++ b/src/block_allocator.c
@@ -413,7 +413,7 @@ static INLINE int bv_get(struct bitvector * bv, size_t n) {
return !!(bv->v[c] & (BV_ONE << bit));
}
-static INLINE size_t bv_ctz(struct bitvector * bv, size_t n) {
+static size_t bv_ctz(struct bitvector * bv, size_t n) {
size_t bit = n % BV_LENGTH;
size_t c = n / BV_LENGTH;
bv_int_t * _v = bv->v + c;
@@ -436,7 +436,7 @@ RET:
}
#ifdef BA_DEBUG
-static INLINE void bv_print(struct bitvector * bv) {
+static void bv_print(struct bitvector * bv) {
size_t i;
for (i = 0; i < bv->length; i++) {
fprintf(stderr, "%d", bv_get(bv, i));
@@ -504,25 +504,29 @@ struct ba_block_header * ba_sort_list(const struct ba_page * p,
return b;
}
-static INLINE void ba_list_defined(struct block_allocator * a, struct ba_block_header * b) {
#ifdef USE_VALGRIND
+static void ba_list_defined(struct block_allocator * a, struct ba_block_header * b) {
while (b && b != BA_ONE) {
PIKE_MEMPOOL_ALLOC(a, b, a->l.block_size);
PIKE_MEM_RW_RANGE(b, sizeof(struct ba_block_header));
b = b->next;
}
-#endif
}
+#else
+#define ba_list_defined(a, b)
+#endif
-static INLINE void ba_list_undefined(struct block_allocator * a, struct ba_block_header * b) {
#ifdef USE_VALGRIND
+static void ba_list_undefined(struct block_allocator * a, struct ba_block_header * b) {
while (b && b != BA_ONE) {
struct ba_block_header * next = b->next;
PIKE_MEMPOOL_FREE(a, b, a->l.block_size);
b = next;
}
-#endif
}
+#else
+#define ba_list_undefined(a, b)
+#endif
/*
* This function allows iteration over all allocated blocks. Some things are not allowed:
--
GitLab