Merge pull request #6837 from gilles-peskine-arm/code-style-more-kr-20221222-2.28

Backport 2.28: Tweak code style to be more like K&R