[ros-diffs] [cwittich] 30670: fix some PREfast warnings