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