Skip to content

Commit 49c09b3

Browse files
author
Daniel Lemire
committed
lint
1 parent cfbd414 commit 49c09b3

File tree

5 files changed

+25
-27
lines changed

5 files changed

+25
-27
lines changed

include/roaring/roaring.h

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@
1313

1414
// Include other headers after roaring_types.h
1515
#include <roaring/bitset/bitset.h>
16+
#include <roaring/containers/containers.h>
1617
#include <roaring/memory.h>
1718
#include <roaring/portability.h>
18-
#include <roaring/roaring_version.h>
19-
20-
21-
22-
#include <roaring/containers/containers.h>
2319
#include <roaring/roaring_array.h>
20+
#include <roaring/roaring_version.h>
2421

2522
#ifdef __cplusplus
2623
extern "C" {
@@ -467,11 +464,12 @@ bool roaring_bitmap_remove_checked(roaring_bitmap_t *r, uint32_t x);
467464
/**
468465
* Check if value is present
469466
*/
470-
static inline bool roaring_bitmap_contains(const roaring_bitmap_t *r, uint32_t val) {
467+
static inline bool roaring_bitmap_contains(const roaring_bitmap_t *r,
468+
uint32_t val) {
471469
// For performance reasons, this function is inline and uses internal
472470
// functions directly.
473471
#ifdef __cplusplus
474-
using namespace ::roaring::internal;
472+
using namespace ::roaring::internal;
475473
#endif
476474
const uint16_t hb = val >> 16;
477475
/*
@@ -489,7 +487,6 @@ using namespace ::roaring::internal;
489487
return container_contains(container, val & 0xFFFF, typecode);
490488
}
491489

492-
493490
/**
494491
* Check whether a range of values from range_start (included)
495492
* to range_end (excluded) is present

src/containers/containers.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <roaring/containers/containers.h>
22
#include <roaring/memory.h>
3+
34
#include "roaring_internal_inline.h"
45

56
#ifdef __cplusplus

src/roaring.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "roaring_internal_inline.h"
1818

19-
2019
#ifdef __cplusplus
2120
using namespace ::roaring::internal;
2221

@@ -27,7 +26,8 @@ namespace api {
2726

2827
#define CROARING_SERIALIZATION_ARRAY_UINT32 1
2928
#define CROARING_SERIALIZATION_CONTAINER 2
30-
extern inline bool roaring_bitmap_contains(const roaring_bitmap_t *r, uint32_t val);
29+
extern inline bool roaring_bitmap_contains(const roaring_bitmap_t *r,
30+
uint32_t val);
3131
extern inline int roaring_trailing_zeroes(unsigned long long input_num);
3232
extern inline int roaring_leading_zeroes(unsigned long long input_num);
3333
extern inline void roaring_bitmap_init_cleared(roaring_bitmap_t *r);
@@ -1832,8 +1832,8 @@ bool roaring_uint32_iterator_advance(roaring_uint32_iterator_t *it) {
18321832
return (it->has_value = loadfirstvalue(it));
18331833
}
18341834
uint16_t low16 = (uint16_t)it->current_value;
1835-
if (container_iterator_next_inline(it->container, it->typecode, &it->container_it,
1836-
&low16)) {
1835+
if (container_iterator_next_inline(it->container, it->typecode,
1836+
&it->container_it, &low16)) {
18371837
it->current_value = it->highbits | low16;
18381838
return (it->has_value = true);
18391839
}
@@ -1850,8 +1850,8 @@ bool roaring_uint32_iterator_previous(roaring_uint32_iterator_t *it) {
18501850
return (it->has_value = loadlastvalue(it));
18511851
}
18521852
uint16_t low16 = (uint16_t)it->current_value;
1853-
if (container_iterator_prev_inline(it->container, it->typecode, &it->container_it,
1854-
&low16)) {
1853+
if (container_iterator_prev_inline(it->container, it->typecode,
1854+
&it->container_it, &low16)) {
18551855
it->current_value = it->highbits | low16;
18561856
return (it->has_value = true);
18571857
}

src/roaring64.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include "roaring_internal_inline.h"
2121

22-
2322
#define CROARING_ALIGN_BUF(buf, alignment) \
2423
(char *)(((uintptr_t)(buf) + ((alignment)-1)) & \
2524
(ptrdiff_t)(~((alignment)-1)))
@@ -2611,8 +2610,9 @@ bool roaring64_iterator_advance(roaring64_iterator_t *it) {
26112610
}
26122611
leaf_t leaf = (leaf_t)*it->art_it.value;
26132612
uint16_t low16 = (uint16_t)it->value;
2614-
if (container_iterator_next_inline(get_container(it->r, leaf), get_typecode(leaf),
2615-
&it->container_it, &low16)) {
2613+
if (container_iterator_next_inline(get_container(it->r, leaf),
2614+
get_typecode(leaf), &it->container_it,
2615+
&low16)) {
26162616
it->value = it->high48 | low16;
26172617
return (it->has_value = true);
26182618
}
@@ -2634,8 +2634,9 @@ bool roaring64_iterator_previous(roaring64_iterator_t *it) {
26342634
}
26352635
leaf_t leaf = (leaf_t)*it->art_it.value;
26362636
uint16_t low16 = (uint16_t)it->value;
2637-
if (container_iterator_prev_inline(get_container(it->r, leaf), get_typecode(leaf),
2638-
&it->container_it, &low16)) {
2637+
if (container_iterator_prev_inline(get_container(it->r, leaf),
2638+
get_typecode(leaf), &it->container_it,
2639+
&low16)) {
26392640
it->value = it->high48 | low16;
26402641
return (it->has_value = true);
26412642
}

src/roaring_internal_inline.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ namespace roaring {
77
namespace internal {
88
#endif
99

10-
static inline bool container_iterator_next_inline(const container_t *c, uint8_t typecode,
11-
roaring_container_iterator_t *it,
12-
uint16_t *value) {
10+
static inline bool container_iterator_next_inline(
11+
const container_t *c, uint8_t typecode, roaring_container_iterator_t *it,
12+
uint16_t *value) {
1313
switch (typecode) {
1414
case BITSET_CONTAINER_TYPE: {
1515
const bitset_container_t *bc = const_CAST_bitset(c);
@@ -71,9 +71,9 @@ static inline bool container_iterator_next_inline(const container_t *c, uint8_t
7171
}
7272
}
7373

74-
static inline bool container_iterator_prev_inline(const container_t *c, uint8_t typecode,
75-
roaring_container_iterator_t *it,
76-
uint16_t *value) {
74+
static inline bool container_iterator_prev_inline(
75+
const container_t *c, uint8_t typecode, roaring_container_iterator_t *it,
76+
uint16_t *value) {
7777
switch (typecode) {
7878
case BITSET_CONTAINER_TYPE: {
7979
if (--it->index < 0) {
@@ -135,5 +135,4 @@ static inline bool container_iterator_prev_inline(const container_t *c, uint8_t
135135
} // extern "C" { namespace roaring { namespace internal {
136136
#endif
137137

138-
139-
#endif // ROARING_INTERNAL_H
138+
#endif // ROARING_INTERNAL_H

0 commit comments

Comments
 (0)