tree 0b2a6c8a5fa4c6f97d5b69cbf850dc0daed87234
parent f2a4a60698a41fbf23e933daaea5df66cde19e53
author Ed Tanous <ed@tanous.net> 1601417703 -0700
committer Ed Tanous <ed@tanous.net> 1601919779 +0000

Implement bugprone-branch-clone compliance

As part of getting the clang-tidy bugprone tests running, these
conditionals were found to have duplicate entries, or be somewhat
nonsensical.

Tested: clang-tidy now passes with the branch-compliance check set.
Change-Id: Ibec106f3bbd866fc471a1fc56bd8cdd5d44024e0