-indentation, code cleanup

[oweals/gnunet.git] / src / set / ibf.c

diff --git a/src/set/ibf.c b/src/set/ibf.c
index e3c5be59a6341aaeca4a20c288a73fdd09f83bf4..3b28e15e1ea5e04ecbb22e71fae9050e22c4b25e 100644 (file)
--- a/src/set/ibf.c
+++ b/src/set/ibf.c
@@ -4,7 +4,7 @@
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
-      by the Free Software Foundation; either version 2, or (at your
+      by the Free Software Foundation; either version 3, or (at your
       option) any later version.
 
       GNUnet is distributed in the hope that it will be useful, but
@@ -80,8 +80,8 @@ ibf_create (uint32_t size, uint8_t hash_num)
 
   ibf = GNUNET_malloc (sizeof (struct InvertibleBloomFilter));
   ibf->count = GNUNET_malloc (size * sizeof (uint8_t));
-  ibf->key_sum = GNUNET_malloc (size * sizeof (struct GNUNET_HashCode));
-  ibf->key_hash_sum = GNUNET_malloc (size * sizeof (struct GNUNET_HashCode));
+  ibf->key_sum = GNUNET_malloc (size * sizeof (struct IBF_Key));
+  ibf->key_hash_sum = GNUNET_malloc (size * sizeof (struct IBF_KeyHash));
   ibf->size = size;
   ibf->hash_num = hash_num;
 
@@ -97,8 +97,9 @@ ibf_get_indices (const struct InvertibleBloomFilter *ibf,
 {
   uint32_t filled;
   uint32_t i;
-  uint32_t bucket = key.key_val & 0xFFFFFFFF;
+  uint32_t bucket;
 
+  bucket = GNUNET_CRYPTO_crc32_n (&key, sizeof key);
   for (i = 0, filled=0; filled < ibf->hash_num; i++)
   {
     unsigned int j;
@@ -235,7 +236,7 @@ ibf_decode (struct InvertibleBloomFilter *ibf,
 /**
  * Write buckets from an ibf to a buffer.
  * Exactly (IBF_BUCKET_SIZE*ibf->size) bytes are written to buf.
- * 
+ *
  * @param ibf the ibf to write
  * @param start with which bucket to start
  * @param count how many buckets to write
@@ -261,7 +262,6 @@ ibf_write_slice (const struct InvertibleBloomFilter *ibf, uint32_t start, uint32
   /* copy counts */
   count_dst = (struct IBF_Count *) key_hash_dst;
   memcpy (count_dst, ibf->count + start, count * sizeof *count_dst);
-  count_dst += count;
 }
 
 
@@ -294,7 +294,6 @@ ibf_read_slice (const void *buf, uint32_t start, uint32_t count, struct Invertib
   /* copy counts */
   count_src = (struct IBF_Count *) key_hash_src;
   memcpy (ibf->count + start, count_src, count * sizeof *count_src);
-  count_src += count;
 }