Merge branch 'mainstream'

[sliver-openvswitch.git] / lib / util.c

diff --git a/lib/util.c b/lib/util.c
index eb8beca..c2ffab2 100644 (file)
--- a/lib/util.c
+++ b/lib/util.c
@@ -918,7 +918,7 @@ raw_ctz(uint64_t n)
 
 /* Returns the number of 1-bits in 'x', between 0 and 32 inclusive. */
 static unsigned int
-popcount32(uint32_t x)
+count_1bits_32(uint32_t x)
 {
     /* In my testing, this implementation is over twice as fast as any other
      * portable implementation that I tried, including GCC 4.4
@@ -940,21 +940,21 @@ popcount32(uint32_t x)
 #define INIT32(X) INIT16(X), INIT16((X) + 16)
 #define INIT64(X) INIT32(X), INIT32((X) + 32)
 
-    static const uint8_t popcount8[256] = {
+    static const uint8_t count_1bits_8[256] = {
         INIT64(0), INIT64(64), INIT64(128), INIT64(192)
     };
 
-    return (popcount8[x & 0xff] +
-            popcount8[(x >> 8) & 0xff] +
-            popcount8[(x >> 16) & 0xff] +
-            popcount8[x >> 24]);
+    return (count_1bits_8[x & 0xff] +
+            count_1bits_8[(x >> 8) & 0xff] +
+            count_1bits_8[(x >> 16) & 0xff] +
+            count_1bits_8[x >> 24]);
 }
 
 /* Returns the number of 1-bits in 'x', between 0 and 64 inclusive. */
 unsigned int
-popcount(uint64_t x)
+count_1bits(uint64_t x)
 {
-    return popcount32(x) + popcount32(x >> 32);
+    return count_1bits_32(x) + count_1bits_32(x >> 32);
 }
 
 /* Returns true if the 'n' bytes starting at 'p' are zeros. */