updating to version 4.2.2

Author: lemire

Sources/CRoaring/include/roaring.h

@@ -1,5 +1,5 @@
 // !!! DO NOT EDIT - THIS IS AN AUTO-GENERATED FILE !!!
-// Created by amalgamation.sh on 2024-10-04T22:14:33Z
+// Created by amalgamation.sh on 2025-02-24T20:10:07Z
 
 /*
  * The CRoaring project is under a dual license (Apache/MIT).
@@ -59,11 +59,11 @@
 // /include/roaring/roaring_version.h automatically generated by release.py, do not change by hand
 #ifndef ROARING_INCLUDE_ROARING_VERSION
 #define ROARING_INCLUDE_ROARING_VERSION
-#define ROARING_VERSION "4.2.1"
+#define ROARING_VERSION "4.2.2"
 enum {
     ROARING_VERSION_MAJOR = 4,
     ROARING_VERSION_MINOR = 2,
-    ROARING_VERSION_REVISION = 1
+    ROARING_VERSION_REVISION = 2
 };
 #endif // ROARING_INCLUDE_ROARING_VERSION
 // clang-format on/* end file include/roaring/roaring_version.h */
@@ -86,9 +86,10 @@ enum {
 #ifndef CROARING_INCLUDE_PORTABILITY_H_
 #define CROARING_INCLUDE_PORTABILITY_H_
 
-//#ifndef _GNU_SOURCE
-//#define _GNU_SOURCE 1
-//#endif  // _GNU_SOURCE
+// Users who need _GNU_SOURCE should define it?
+// #ifndef _GNU_SOURCE
+// #define _GNU_SOURCE 1
+// #endif  // _GNU_SOURCE
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS 1
 #endif  // __STDC_FORMAT_MACROS
@@ -1072,7 +1073,8 @@ inline size_t bitset_next_set_bits(const bitset_t *bitset, size_t *buffer,
         return 0;  // nothing more to iterate over
     }
     uint64_t w = bitset->array[x];
-    w >>= (*startfrom & 63);
+    // unset low bits inside the word less than *startfrom
+    w &= ~((UINT64_C(1) << (*startfrom & 63)) - 1);
     size_t howmany = 0;
     size_t base = x << 6;
     while (howmany < capacity) {
@@ -1779,11 +1781,14 @@ roaring_bitmap_t *roaring_bitmap_portable_deserialize(const char *buf);
  * order. This is is guaranteed to happen when serializing an existing bitmap,
  * but not for random inputs.
  *
- * You may use roaring_bitmap_internal_validate to check the validity of the
- * bitmap prior to using it.
+ * If the source is untrusted, you should call
+ * roaring_bitmap_internal_validate to check the validity of the
+ * bitmap prior to using it. Only after calling roaring_bitmap_internal_validate
+ * is the bitmap considered safe for use.
  *
- * We recommend that you use checksums to check that serialized data corresponds
- * to a serialized bitmap.
+ * We also recommend that you use checksums to check that serialized data
+ * corresponds to the serialized bitmap. The CRoaring library does not provide
+ * checksumming.
  *
  * This function is endian-sensitive. If you have a big-endian system (e.g., a
  * mainframe IBM s390x), the data format is going to be big-endian and not
@@ -2313,6 +2318,10 @@ CROARING_DEPRECATED static inline uint32_t roaring_read_uint32_iterator(
 using namespace ::roaring::api;
 #endif
 #endif
+
+// roaring64 will include roaring.h, but we would
+// prefer to avoid having our users include roaring64.h
+// in addition to roaring.h.
 /* end file include/roaring/roaring.h */
 /* begin file include/roaring/memory.h */
 #ifndef INCLUDE_ROARING_MEMORY_H_
@@ -2902,11 +2911,14 @@ size_t roaring64_bitmap_portable_deserialize_size(const char *buf,
  * order. This is is guaranteed to happen when serializing an existing bitmap,
  * but not for random inputs.
  *
- * You may use roaring64_bitmap_internal_validate to check the validity of the
- * bitmap prior to using it.
+ * If the source is untrusted, you should call
+ * roaring64_bitmap_internal_validate to check the validity of the
+ * bitmap prior to using it. Only after calling
+ * roaring64_bitmap_internal_validate is the bitmap considered safe for use.
  *
- * We recommend that you use checksums to check that serialized data corresponds
- * to a serialized bitmap.
+ * We also recommend that you use checksums to check that serialized data
+ * corresponds to the serialized bitmap. The CRoaring library does not provide
+ * checksumming.
  *
  * This function is endian-sensitive. If you have a big-endian system (e.g., a
  * mainframe IBM s390x), the data format is going to be big-endian and not

Sources/CRoaring/roaring.c

@@ -1,5 +1,5 @@
 // !!! DO NOT EDIT - THIS IS AN AUTO-GENERATED FILE !!!
-// Created by amalgamation.sh on 2024-10-04T22:14:33Z
+// Created by amalgamation.sh on 2025-02-24T20:10:07Z
 
 /*
  * The CRoaring project is under a dual license (Apache/MIT).
@@ -10418,7 +10418,7 @@ static art_val_t *art_find_at(const art_node_t *node,
 }
 
 // Returns the size in bytes of the subtrie.
-size_t art_size_in_bytes_at(const art_node_t *node) {
+static size_t art_size_in_bytes_at(const art_node_t *node) {
     if (art_is_leaf(node)) {
         return 0;
     }
@@ -10472,7 +10472,7 @@ static void art_node_print_type(const art_node_t *node) {
     }
 }
 
-void art_node_printf(const art_node_t *node, uint8_t depth) {
+static void art_node_printf(const art_node_t *node, uint8_t depth) {
     if (art_is_leaf(node)) {
         printf("{ type: Leaf, key: ");
         art_leaf_t *leaf = CROARING_CAST_LEAF(node);
@@ -22982,19 +22982,6 @@ roaring64_bitmap_t *roaring64_bitmap_of_ptr(size_t n_args,
     return r;
 }
 
-roaring64_bitmap_t *roaring64_bitmap_of(size_t n_args, ...) {
-    roaring64_bitmap_t *r = roaring64_bitmap_create();
-    roaring64_bulk_context_t context = CROARING_ZERO_INITIALIZER;
-    va_list ap;
-    va_start(ap, n_args);
-    for (size_t i = 0; i < n_args; i++) {
-        uint64_t val = va_arg(ap, uint64_t);
-        roaring64_bitmap_add_bulk(r, &context, val);
-    }
-    va_end(ap);
-    return r;
-}
-
 static inline leaf_t *containerptr_roaring64_bitmap_add(roaring64_bitmap_t *r,
                                                         uint8_t *high48,
                                                         uint16_t low16,