From b9ccff0761532b65a26edb1f7ac9f80c3ff58aa1 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Mon, 27 Sep 2021 12:41:40 +0200 Subject: Compilation fixed on CentOS 7 Bitmap APi changes --- src/lib/ndpi_bitmap.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/lib/ndpi_bitmap.c') diff --git a/src/lib/ndpi_bitmap.c b/src/lib/ndpi_bitmap.c index ecb238da7..17ba59b00 100644 --- a/src/lib/ndpi_bitmap.c +++ b/src/lib/ndpi_bitmap.c @@ -103,7 +103,7 @@ ndpi_bitmap* ndpi_bitmap_deserialize(char *buf) { /* ******************************************* */ /* b = b & b_and */ -void ndpi_bitmap_and(ndpi_bitmap* b, ndpi_bitmap* b_and) { +void ndpi_bitmap_and(ndpi_bitmap* a, ndpi_bitmap* b_and) { roaring_bitmap_and_inplace((ndpi_bitmap*)a, (ndpi_bitmap*)b_and); } @@ -116,20 +116,13 @@ void ndpi_bitmap_or(ndpi_bitmap* a, ndpi_bitmap* b_or) { /* ******************************************* */ -/* b = b | b_or */ -void ndpi_bitmap_or(ndpi_bitmap* a, ndpi_bitmap* b_or) { - roaring_bitmap_or_inplace((ndpi_bitmap*)a, (ndpi_bitmap*)b_or); -} - -/* ******************************************* */ - ndpi_bitmap_iterator* ndpi_bitmap_iterator_alloc(ndpi_bitmap* b) { return(roaring_create_iterator((ndpi_bitmap*)b)); } /* ******************************************* */ -ndpi_bitmap_iterator* ndpi_bitmap_iterator_free(ndpi_bitmap* b) { +void ndpi_bitmap_iterator_free(ndpi_bitmap* b) { return(roaring_free_uint32_iterator((ndpi_bitmap*)b)); } -- cgit v1.2.3