[ros-diffs] [weiden] 27966: Fix some functions to match their prototypes