lib,pbrd: clean up style issues

Fix a couple of style warnings introduced by recent PR 14050.

Signed-off-by: Mark Stapp <mjs@labn.net>

diff --git a/lib/zclient.c b/lib/zclient.c
index c6d06ee6d6103838131be434237ed32c18cd9f48..c36bcc6e2e4c99fe9fdaee6e4bb58bf1934ac79f 100644 (file)
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -1628,7 +1628,7 @@ stream_failure:
 static void zapi_pbr_rule_filter_encode(struct stream *s, struct pbr_filter *f)
 {
        assert(f->src_ip.family == f->dst_ip.family);
-       assert((AF_INET == f->src_ip.family) || (AF_INET6 == f->src_ip.family));
+       assert((f->src_ip.family == AF_INET) || (f->src_ip.family == AF_INET6));
 
        stream_putl(s, f->filter_bm);
        stream_putc(s, f->ip_proto);

diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c
index f4bf287c5951be50c0b968bd16f7d636cfe41347..030c4c1114ea808e432c6db4ed7eff480d7b74fd 100644 (file)
--- a/pbrd/pbr_zebra.c
+++ b/pbrd/pbr_zebra.c
@@ -588,13 +588,13 @@ static bool pbr_encode_pbr_map_sequence(struct stream *s,
         * can copy here instead of trying to infer from magic values.
         */
        SET_FLAG(r.action.flags, PBR_ACTION_TABLE); /* always valid */
-       if (PBR_MAP_UNDEFINED_QUEUE_ID != pbrms->action_queue_id)
+       if (pbrms->action_queue_id != PBR_MAP_UNDEFINED_QUEUE_ID)
                SET_FLAG(r.action.flags, PBR_ACTION_QUEUE_ID);
-       if (0 != pbrms->action_pcp)
+       if (pbrms->action_pcp != 0)
                SET_FLAG(r.action.flags, PBR_ACTION_PCP);
-       if (0 != pbrms->action_vlan_id)
+       if (pbrms->action_vlan_id != 0)
                SET_FLAG(r.action.flags, PBR_ACTION_VLAN_ID);
-       if (0 != pbrms->action_vlan_flags)
+       if (pbrms->action_vlan_flags != 0)
                SET_FLAG(r.action.flags, PBR_ACTION_VLAN_FLAGS);
 
        /*