Cppcheck style

This patch is built successfully.