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
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
incrementBit (char *bitArray, unsigned int bitIdx,
const struct GNUNET_DISK_FileHandle *fh)
{
- OFF_T fileSlot;
+ off_t fileSlot;
unsigned char value;
unsigned int high;
unsigned int low;
decrementBit (char *bitArray, unsigned int bitIdx,
const struct GNUNET_DISK_FileHandle *fh)
{
- OFF_T fileSlot;
+ off_t fileslot;
unsigned char value;
unsigned int high;
unsigned int low;
if (GNUNET_DISK_handle_invalid (fh))
return; /* cannot decrement! */
/* Each char slot in the counter file holds two 4 bit counters */
- fileSlot = bitIdx / 2;
+ fileslot = bitIdx / 2;
targetLoc = bitIdx % 2;
- GNUNET_DISK_file_seek (fh, fileSlot, GNUNET_DISK_SEEK_SET);
+ if (GNUNET_SYSERR == GNUNET_DISK_file_seek (fh, fileslot, GNUNET_DISK_SEEK_SET))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "seek");
+ return;
+ }
if (1 != GNUNET_DISK_file_read (fh, &value, 1))
value = 0;
low = value & 0xF;
}
}
value = ((high << 4) | low);
- GNUNET_DISK_file_seek (fh, fileSlot, GNUNET_DISK_SEEK_SET);
+ if (GNUNET_SYSERR == GNUNET_DISK_file_seek (fh, fileslot, GNUNET_DISK_SEEK_SET))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "seek");
+ return;
+ }
GNUNET_assert (1 == GNUNET_DISK_file_write (fh, &value, 1));
}
*/
static void
iterateBits (const struct GNUNET_CONTAINER_BloomFilter *bf,
- BitIterator callback, void *arg, const struct GNUNET_HashCode * key)
+ BitIterator callback, void *arg, const struct GNUNET_HashCode *key)
{
struct GNUNET_HashCode tmp[2];
int bitCount;
{
if (GNUNET_YES !=
callback (arg, bf,
- (((uint32_t *) & tmp[round & 1])[slot]) %
+ ntohl ((((uint32_t *) & tmp[round & 1])[slot])) %
((bf->bitArraySize * 8LL))))
return;
slot++;
{
struct GNUNET_CONTAINER_BloomFilter *bf;
char *rbuff;
- OFF_T pos;
+ off_t pos;
int i;
size_t ui;
- OFF_T fsize;
+ off_t fsize;
int must_read;
GNUNET_assert (NULL != filename);
}
bf->bitArraySize = size;
bf->addressesPerElement = k;
- if (GNUNET_YES != must_read)
- return bf; /* already done! */
+ if (GNUNET_YES != must_read)
+ return bf; /* already done! */
/* Read from the file what bits we can */
rbuff = GNUNET_malloc (BUFFSIZE);
pos = 0;
*
* @param bf the filter
* @param to_or the bloomfilter to or-in
- * @param size number of bytes in data
+ * @return #GNUNET_OK on success
*/
int
GNUNET_CONTAINER_bloomfilter_or2 (struct GNUNET_CONTAINER_BloomFilter *bf,
const struct GNUNET_CONTAINER_BloomFilter
- *to_or, size_t size)
+ *to_or)
{
unsigned int i;
unsigned int n;
unsigned long long *fc;
const unsigned long long *dc;
+ size_t size;
if (NULL == bf)
- return GNUNET_YES;
- if (bf->bitArraySize != size)
+ return GNUNET_OK;
+ if (bf->bitArraySize != to_or->bitArraySize)
+ {
+ GNUNET_break (0);
return GNUNET_SYSERR;
+ }
+ size = bf->bitArraySize;
fc = (unsigned long long *) bf->bitArray;
dc = (const unsigned long long *) to_or->bitArray;
n = size / sizeof (unsigned long long);
return GNUNET_OK;
}
+
/**
* Remove an element from the filter.
*