util: Group functions for bitwise tests.

This only moves code around for more logical grouping.

Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/util.h b/lib/util.h
index a1f4bd740226fd899591003eb77afc27fe196200..c087b53f4f3cf7a6bca6345e9014904e8b245055 100644 (file)
--- a/lib/util.h
+++ b/lib/util.h
@@ -96,22 +96,6 @@ is_pow2(uintmax_t x)
     return IS_POW2(x);
 }
 
-/* Returns the rightmost 1-bit in 'x' (e.g. 01011000 => 00001000), or 0 if 'x'
- * is 0. */
-static inline uintmax_t
-rightmost_1bit(uintmax_t x)
-{
-    return x & -x;
-}
-
-/* Returns 'x' with its rightmost 1-bit changed to a zero (e.g. 01011000 =>
- * 01010000), or 0 if 'x' is 0. */
-static inline uintmax_t
-zero_rightmost_1bit(uintmax_t x)
-{
-    return x & (x - 1);
-}
-
 #ifndef MIN
 #define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
 #endif
@@ -242,6 +226,8 @@ char *xreadlink(const char *filename);
 char *follow_symlinks(const char *filename);
 
 void ignore(bool x OVS_UNUSED);
+\f
+/* Bitwise tests. */
 
 /* Returns the number of trailing 0-bits in 'n'.  Undefined if 'n' == 0.
  *
@@ -270,6 +256,22 @@ int log_2_floor(uint32_t);
 int log_2_ceil(uint32_t);
 int popcount(uint32_t);
 
+/* Returns the rightmost 1-bit in 'x' (e.g. 01011000 => 00001000), or 0 if 'x'
+ * is 0. */
+static inline uintmax_t
+rightmost_1bit(uintmax_t x)
+{
+    return x & -x;
+}
+
+/* Returns 'x' with its rightmost 1-bit changed to a zero (e.g. 01011000 =>
+ * 01010000), or 0 if 'x' is 0. */
+static inline uintmax_t
+zero_rightmost_1bit(uintmax_t x)
+{
+    return x & (x - 1);
+}
+\f
 bool is_all_zeros(const uint8_t *, size_t);
 bool is_all_ones(const uint8_t *, size_t);
 void bitwise_copy(const void *src, unsigned int src_len, unsigned int src_ofs,