From a429192507227445591d0f2dca69f0248796484e Mon Sep 17 00:00:00 2001
From: Pablo Rincon <pablo.rincon.crespo@gmail.com>
Date: Sat, 24 Apr 2010 03:19:40 +0200
Subject: [PATCH] Moving inline functions to the .h files, so gcc can inline
 them correctly

---
 src/util-bloomfilter.c | 16 ----------------
 src/util-bloomfilter.h | 21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/util-bloomfilter.c b/src/util-bloomfilter.c
index 079ab06606..222253ef63 100644
--- a/src/util-bloomfilter.c
+++ b/src/util-bloomfilter.c
@@ -77,22 +77,6 @@ int BloomFilterAdd(BloomFilter *bf, void *data, uint16_t datalen) {
     return 0;
 }
 
-inline int BloomFilterTest(BloomFilter *bf, void *data, uint16_t datalen) {
-    uint8_t iter = 0;
-    uint32_t hash = 0;
-    int hit = 1;
-
-    for (iter = 0; iter < bf->hash_iterations; iter++) {
-        hash = bf->Hash(data, datalen, iter, bf->bitarray_size);
-        if (!(bf->bitarray[hash/8] & (1<<hash%8))) {
-            hit = 0;
-            break;
-        }
-    }
-
-    return hit;
-}
-
 uint32_t BloomFilterMemoryCnt(BloomFilter *bf) {
      if (bf == NULL)
          return 0;
diff --git a/src/util-bloomfilter.h b/src/util-bloomfilter.h
index 7a1fa11ca4..e59e554f61 100644
--- a/src/util-bloomfilter.h
+++ b/src/util-bloomfilter.h
@@ -16,11 +16,30 @@ BloomFilter *BloomFilterInit(uint32_t, uint8_t, uint32_t (*Hash)(void *, uint16_
 void BloomFilterFree(BloomFilter *);
 void BloomFilterPrint(BloomFilter *);
 int BloomFilterAdd(BloomFilter *, void *, uint16_t);
-inline int BloomFilterTest(BloomFilter *, void *, uint16_t);
 uint32_t BloomFilterMemoryCnt(BloomFilter *);
 uint32_t BloomFilterMemorySize(BloomFilter *);
 
 void BloomFilterRegisterTests(void);
 
+/** ----- Inline functions ---- */
+
+static inline int BloomFilterTest(BloomFilter *, void *, uint16_t);
+
+static inline int BloomFilterTest(BloomFilter *bf, void *data, uint16_t datalen) {
+    uint8_t iter = 0;
+    uint32_t hash = 0;
+    int hit = 1;
+
+    for (iter = 0; iter < bf->hash_iterations; iter++) {
+        hash = bf->Hash(data, datalen, iter, bf->bitarray_size);
+        if (!(bf->bitarray[hash/8] & (1<<hash%8))) {
+            hit = 0;
+            break;
+        }
+    }
+
+    return hit;
+}
+
 #endif /* __BLOOMFILTER_H__ */