Cppcheck style 2

This patch is built successfully.