Change-Id: I156b5b16bbd93817ed1f1ad975c1a1dbdfb520f0
Signed-off-by: Nshuaiyutao <shuaiyutao1@huawei.com>

Also clean up comparisons between different types, and some odd
indentation problems that showed up somehow.

A new endless loop was introduced by the clang compiler, which
apparently does odd things when the right operand of << is equal to
or greater than the number of bits in the type.  The C standard in
fact states that the behavior of << is undefined in that case.  The
loop was rewritten to use single-bit shifts.