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