cppcheck style warnings

second patch.