[ovs-dev] [PATCH] Use is_pow2() function, where possible, instead of IS_POW2 macro.

Ben Pfaff blp at nicira.com
Fri Feb 1 22:50:09 UTC 2013


The IS_POW2 macro is meant for use in contexts where a function call is not
allowed.

Signed-off-by: Ben Pfaff <blp at nicira.com>
---
This is a repost of a patch originally posted Oct. 31, 2012.

 lib/util.c            |    2 +-
 utilities/ovs-ofctl.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util.c b/lib/util.c
index 83d3ff8..cbaffa7 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -810,7 +810,7 @@ log_2_floor(uint32_t n)
 int
 log_2_ceil(uint32_t n)
 {
-    return log_2_floor(n) + !IS_POW2(n);
+    return log_2_floor(n) + !is_pow2(n);
 }
 
 /* Returns the number of trailing 0-bits in 'n'.  Undefined if 'n' == 0. */
diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index 4d8c39f..ec775c7 100644
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -2182,7 +2182,7 @@ ofctl_parse_flows__(struct ofputil_flow_mod *fms, size_t n_fms)
             break;
         }
     }
-    ovs_assert(IS_POW2(protocol));
+    ovs_assert(is_pow2(protocol));
 
     printf("chosen protocol: %s\n", ofputil_protocol_to_string(protocol));
 
-- 
1.7.2.5




More information about the dev mailing list