OSDN Git Service

net/ipv4: fib_trie: Avoid cryptic ternary expressions
authorMatthias Kaehlcke <mka@chromium.org>
Tue, 18 Jun 2019 21:14:40 +0000 (14:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Jun 2019 21:29:38 +0000 (17:29 -0400)
commit25cec756891e8733433efea63b2254ddc93aa5cc
tree0b64e73061a7d708b1fc8946cb912c24613586a0
parent16e5a266f51639492ac30761d043525d7d43f4c8
net/ipv4: fib_trie: Avoid cryptic ternary expressions

empty_child_inc/dec() use the ternary operator for conditional
operations. The conditions involve the post/pre in/decrement
operator and the operation is only performed when the condition
is *not* true. This is hard to parse for humans, use a regular
'if' construct instead and perform the in/decrement separately.

This also fixes two warnings that are emitted about the value
of the ternary expression being unused, when building the kernel
with clang + "kbuild: Remove unnecessary -Wno-unused-value"
(https://lore.kernel.org/patchwork/patch/1089869/):

CC      net/ipv4/fib_trie.o
net/ipv4/fib_trie.c:351:2: error: expression result unused [-Werror,-Wunused-value]
        ++tn_info(n)->empty_children ? : ++tn_info(n)->full_children;

Fixes: 95f60ea3e99a ("fib_trie: Add collapse() and should_collapse() to resize")
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Acked-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/fib_trie.c