Merge pull request #615 from JohnSanpe/fixup-bfdev

fixup bfdev: fixed some style issue

Author: sanpeqf

include/bfdev/align.h

@@ -47,8 +47,8 @@ BFDEV_BEGIN_DECLS
  * @align: alignment size.
  */
 #define bfdev_align_high(value, align) ({ \
-    typeof(align) _align = (align); \
-    ((value) + (_align - 1)) & ~(_align - 1); \
+    typeof(align) __align = (align); \
+    ((value) + (__align - 1)) & ~(__align - 1); \
 })
 
 /**

include/bfdev/jhash.h

@@ -17,12 +17,12 @@ BFDEV_BEGIN_DECLS
 
 /* Mix 3 32-bit values reversibly */
 #define bfdev_jhash_mix(a, b, c) {              \
-	a -= c; a ^= bfdev_rol32(c, 4);  c += b;    \
-	b -= a; b ^= bfdev_rol32(a, 6);  a += c;    \
-	c -= b; c ^= bfdev_rol32(b, 8);  b += a;    \
+	a -= c; a ^= bfdev_rol32(c,  4); c += b;    \
+	b -= a; b ^= bfdev_rol32(a,  6); a += c;    \
+	c -= b; c ^= bfdev_rol32(b,  8); b += a;    \
 	a -= c; a ^= bfdev_rol32(c, 16); c += b;    \
 	b -= a; b ^= bfdev_rol32(a, 19); a += c;    \
-	c -= b; c ^= bfdev_rol32(b, 4);  b += a;    \
+	c -= b; c ^= bfdev_rol32(b,  4); b += a;    \
 }
 
 /* Final mixing of 3 32-bit values (a,b,c) into c */
@@ -31,7 +31,7 @@ BFDEV_BEGIN_DECLS
     a ^= c; a -= bfdev_rol32(c, 11);    \
     b ^= a; b -= bfdev_rol32(a, 25);    \
     c ^= b; c -= bfdev_rol32(b, 16);    \
-    a ^= c; a -= bfdev_rol32(c, 4);     \
+    a ^= c; a -= bfdev_rol32(c,  4);    \
     b ^= a; b -= bfdev_rol32(a, 14);    \
     c ^= b; c -= bfdev_rol32(b, 24);    \
 }

include/bfdev/minmax.h

@@ -16,10 +16,9 @@ BFDEV_BEGIN_DECLS
  * @b: second value.
  */
 #define bfdev_min(a, b) ({ \
-    typeof(a) _amin = (a); \
-    typeof(a) _bmin = (b); \
-    (void)(&_amin == &_bmin); \
-    _amin < _bmin ? _amin : _bmin; \
+    typeof(a) __amin = (a); \
+    typeof(a) __bmin = (b); \
+    __amin < __bmin ? __amin : __bmin; \
 })
 
 /**
@@ -28,10 +27,9 @@ BFDEV_BEGIN_DECLS
  * @b: second value.
  */
 #define bfdev_max(a, b) ({ \
-    typeof(a) _amax = (a); \
-    typeof(a) _bmax = (b); \
-    (void)(&_amax == &_bmax); \
-    _amax > _bmax ? _amax : _bmax; \
+    typeof(a) __amax = (a); \
+    typeof(a) __bmax = (b); \
+    __amax > __bmax ? __amax : __bmax; \
 })
 
 /**

include/bfdev/prandom.h

@@ -65,8 +65,12 @@ bfdev_prandom_value(bfdev_prandom_t *pstate);
 static inline uint64_t
 bfdev_prandom_u64(bfdev_prandom_t *pstate)
 {
-    uint32_t high = bfdev_prandom_value(pstate);
-    return ((uint64_t)high << 32) + bfdev_prandom_value(pstate);
+    uint32_t high, low;
+
+    high = bfdev_prandom_value(pstate);
+    low = bfdev_prandom_value(pstate);
+
+    return ((uint64_t)high << 32) | low;
 }
 
 static inline unsigned long

src/allocator.c

@@ -7,11 +7,15 @@
 #include <bfdev/allocator.h>
 #include <export.h>
 
-export bfdev_alloc_t
-bfdev_alloc_default;
+BFDEV_DEFINE_ALLOC(
+    bfdev_alloc_default,
+    NULL, NULL
+);
 
-export bfdev_alloc_ops_t
-bfdev_alloc_default_ops;
+BFDEV_DEFINE_ALLOC_OPS(
+    bfdev_alloc_default_ops,
+    NULL, NULL, NULL, NULL
+);
 
 #define __INSIDE_ALLOCATOR__
 #include <port/allocator.h>
@@ -75,10 +79,10 @@ bfdev_realloc(const bfdev_alloc_t *alloc, const void *block, size_t resize)
     const bfdev_alloc_ops_t *ops;
     void *pdata, *retval;
 
-    if (!block)
+    if (bfdev_unlikely(!block))
         return bfdev_malloc(alloc, resize);
 
-    if (!resize) {
+    if (bfdev_unlikely(!resize)) {
         bfdev_free(alloc, block);
         return NULL;
     }
@@ -98,7 +102,7 @@ bfdev_free(const bfdev_alloc_t *alloc, const void *block)
     const bfdev_alloc_ops_t *ops;
     void *pdata;
 
-    if (!block)
+    if (bfdev_unlikely(!block))
         return;
 
     ops = alloc_ops(alloc, &pdata);

src/sort.c

@@ -31,8 +31,8 @@ parent(size_t cells, unsigned int lsbit, size_t index)
 export int
 bfdev_sort(void *base, size_t num, size_t cells, bfdev_cmp_t cmp, void *pdata)
 {
-    size_t size, idx1, idx2, idx3, idx4;
-    unsigned int lsbit;
+    size_t idx1, idx2, idx3, idx4;
+    size_t size, lsbit;
 
     idx1 = (num >> 1) * cells;
     if (bfdev_unlikely(!base || !cmp || !idx1))