From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Mon, 20 Jun 2016 13:31:55 +0000 (+0000)
Subject: zebra: Change bitwise operations to purpose-built macros
X-Git-Tag: frr-2.0-rc1~516
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0d72b3440bc912fc1e27a00d96ed0d94af356e6d;p=mirror%2Ffrr.git

zebra: Change bitwise operations to purpose-built macros

Some bitfields for zebra_debug_* flags were being modified
with bitwise operators instead of the purpose-built macros
in lib/zebra.h. Changed such instances to use the macros.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/zebra/debug.c b/zebra/debug.c
index d24d7ab64e..4411be9b99 100644
--- a/zebra/debug.c
+++ b/zebra/debug.c
@@ -112,8 +112,8 @@ DEFUN (debug_zebra_packet,
        "Debug option set for zebra packet\n")
 {
   zebra_debug_packet = ZEBRA_DEBUG_PACKET;
-  zebra_debug_packet |= ZEBRA_DEBUG_SEND;
-  zebra_debug_packet |= ZEBRA_DEBUG_RECV;
+  SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
+  SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
   return CMD_SUCCESS;
 }
 
@@ -128,11 +128,11 @@ DEFUN (debug_zebra_packet_direct,
 {
   zebra_debug_packet = ZEBRA_DEBUG_PACKET;
   if (strncmp ("send", argv[0], strlen (argv[0])) == 0)
-    zebra_debug_packet |= ZEBRA_DEBUG_SEND;
+    SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
   if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
-    zebra_debug_packet |= ZEBRA_DEBUG_RECV;
+    SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
   if (strncmp ("detail", argv[0], strlen (argv[0])) == 0)
-    zebra_debug_packet |= ZEBRA_DEBUG_DETAIL;
+    SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_DETAIL);
   return CMD_SUCCESS;
 }
 
@@ -148,10 +148,10 @@ DEFUN (debug_zebra_packet_detail,
 {
   zebra_debug_packet = ZEBRA_DEBUG_PACKET;
   if (strncmp ("send", argv[0], strlen (argv[0])) == 0)
-    zebra_debug_packet |= ZEBRA_DEBUG_SEND;
+    SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
   if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
-    zebra_debug_packet |= ZEBRA_DEBUG_RECV;
-  zebra_debug_packet |= ZEBRA_DEBUG_DETAIL;
+    SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
+  SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_DETAIL);
   return CMD_SUCCESS;
 }
 
@@ -247,9 +247,9 @@ DEFUN (no_debug_zebra_packet_direct,
        "Debug option set for send packet\n")
 {
   if (strncmp ("send", argv[0], strlen (argv[0])) == 0)
-    zebra_debug_packet &= ~ZEBRA_DEBUG_SEND;
+    UNSET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
   if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
-    zebra_debug_packet &= ~ZEBRA_DEBUG_RECV;
+    UNSET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
   return CMD_SUCCESS;
 }