util: Make popcount() handle 64-bit integers, not separate popcount64().

[cascardo/ovs.git] / lib / flow.c

diff --git a/lib/flow.c b/lib/flow.c
index 1e31982..63c6ef8 100644 (file)
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -1101,7 +1101,7 @@ flow_compose(struct ofpbuf *b, const struct flow *flow)
 static int
 miniflow_n_values(const struct miniflow *flow)
 {
-    return popcount64(flow->map);
+    return popcount(flow->map);
 }
 
 static uint32_t *
@@ -1221,8 +1221,7 @@ miniflow_get__(const struct miniflow *flow, unsigned int u32_ofs)
         static const uint32_t zero = 0;
         return &zero;
     }
-    return flow->values
-        + popcount64(flow->map & ((UINT64_C(1) << u32_ofs) - 1));
+    return flow->values + popcount(flow->map & ((UINT64_C(1) << u32_ofs) - 1));
 }
 
 /* Returns the uint32_t that would be at byte offset '4 * u32_ofs' if 'flow'