fix function signature to match interface & not give warning
fix trailing spaces (whitespace issue)
Merge pull request #2764 from eileenmcnaughton/static_warnings

Static warnings