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