Partially sync files.el from XEmacs 21.5 for wildcard support.

[sxemacs] / src / bloom.c

diff --git a/src/bloom.c b/src/bloom.c
index b2abc37..5c55ceb 100644 (file)
--- a/src/bloom.c
+++ b/src/bloom.c
@@ -872,18 +872,14 @@ mark_bloom(Lisp_Object obj)
 static void
 print_bloom(Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
-       char *tmp = alloca(96);
-
-       snprintf(tmp, 95, "#<bloom-filter :order %u :degree %u :size %u>",
-                XBLOOM_ORDER(obj), XBLOOM_DEGREE(obj), XBLOOM_SIZE(obj));
-
-       write_c_string(tmp, printcharfun);
-
+       write_fmt_string(printcharfun,
+                        "#<bloom-filter :order %u :degree %u :size %u>",
+                        XBLOOM_ORDER(obj), XBLOOM_DEGREE(obj), XBLOOM_SIZE(obj));
        if (escapeflag);
 }
 
 static void
-finalise_bloom(void *header, int UNUSED(for_disksave))
+finalise_bloom(void *header, int SXE_UNUSED(for_disksave))
 {
        Lisp_Bloom *free_me = header;
 
@@ -921,7 +917,7 @@ make_bloom_uninitted(uint32_t order, uint32_t degree)
        Lisp_Bloom *bf = allocate_bloom();
 #if !BLOOM_USE_PRIMES
        /* we must use a 2-power */
-       order = 1 << (1 + __ase_flsl(order - 1));
+       order = __next_2power(order);
 #endif
 
        bloom_order(bf) = order;
@@ -1315,4 +1311,3 @@ void vars_of_bloom(void)
 {
        Fprovide(intern("bloom"));
 }
-