src: reduce indentation

Re-arrange some switch-cases and conditionals to reduce levels of
indentation.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 39b0574e38c8f47d0e6605a4185226608340b8f5..36ead80296912ac6de919c47df783e0532a114b0 100644 (file)
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -2079,14 +2079,10 @@ static bool meta_may_dependency_kill(struct payload_dep_ctx *ctx,
        case NFPROTO_NETDEV:
        case NFPROTO_BRIDGE:
                break;
+       case NFPROTO_IPV4:
+       case NFPROTO_IPV6:
+               return family == nfproto;
        default:
-               if (family == NFPROTO_IPV4 &&
-                   nfproto != NFPROTO_IPV4)
-                       return false;
-               else if (family == NFPROTO_IPV6 &&
-                        nfproto != NFPROTO_IPV6)
-                       return false;
-
                return true;
        }
 

diff --git a/src/payload.c b/src/payload.c
index 79008762825f04f7153e0289fae8059c2e1b7c33..576eb149f71d90cb40d76d12581fb2ac68d1e159 100644 (file)
--- a/src/payload.c
+++ b/src/payload.c
@@ -733,13 +733,17 @@ static bool payload_may_dependency_kill(struct payload_dep_ctx *ctx,
                break;
        }
 
-       if (expr->payload.base == PROTO_BASE_TRANSPORT_HDR &&
-           dep->left->payload.base == PROTO_BASE_TRANSPORT_HDR) {
-               if (dep->left->payload.desc == &proto_icmp)
-                       return payload_may_dependency_kill_icmp(ctx, expr);
-               if (dep->left->payload.desc == &proto_icmp6)
-                       return payload_may_dependency_kill_icmp(ctx, expr);
-       }
+       if (expr->payload.base != PROTO_BASE_TRANSPORT_HDR)
+               return true;
+
+       if (dep->left->payload.base != PROTO_BASE_TRANSPORT_HDR)
+               return true;
+
+       if (dep->left->payload.desc == &proto_icmp)
+               return payload_may_dependency_kill_icmp(ctx, expr);
+
+       if (dep->left->payload.desc == &proto_icmp6)
+               return payload_may_dependency_kill_icmp(ctx, expr);
 
        return true;
 }