summaryrefslogtreecommitdiff
path: root/src/libstddjb/bitarray_count.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-02-15 17:40:40 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-02-15 17:40:40 +0000
commita896ca2a8c617e5e00ffd5fc9e69331ad754e5b3 (patch)
treef49a8382b9999b5aa00c0885eedd5c5c3a233e55 /src/libstddjb/bitarray_count.c
parent00c9cb1b22cc17c4db573e0e613a5f116ff0092e (diff)
downloadskalibs-a896ca2a8c617e5e00ffd5fc9e69331ad754e5b3.tar.xz
add arc4random_addrandom sysdep; next batch of types changes.
The library isn't supposed to be functional yet: there are still a lot of type mismatches.
Diffstat (limited to 'src/libstddjb/bitarray_count.c')
-rw-r--r--src/libstddjb/bitarray_count.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libstddjb/bitarray_count.c b/src/libstddjb/bitarray_count.c
index 724f2b3..47dfda7 100644
--- a/src/libstddjb/bitarray_count.c
+++ b/src/libstddjb/bitarray_count.c
@@ -1,5 +1,7 @@
/* ISC license. */
+#include <sys/types.h>
+#include <skalibs/uint64.h>
#include <skalibs/bitarray.h>
#define B0(n) n, n+1, n+1, n+2
@@ -7,12 +9,12 @@
#define B2(n) B1(n), B1(n+1), B1(n+1), B1(n+2)
#define B3(n) B2(n), B2(n+1), B2(n+1), B2(n+2)
-unsigned int bitarray_countones (unsigned char const *c, unsigned int n)
+uint64_t bitarray_countones (unsigned char const *c, size_t n)
{
static unsigned char const table[256] = { B3(0) } ;
- unsigned int len = bitarray_div8(n) ;
- unsigned int total = 0 ;
- register unsigned int i = 0 ;
+ size_t len = bitarray_div8(n) ;
+ uint64_t total = 0 ;
+ register size_t i = 0 ;
if (n & 7) len-- ;
for (; i < len ; i++) total += table[c[i]] ;
if (n & 7) total += table[c[i] & ((1 << (n & 7)) - 1)] ;