fix splint issues

Splint 3.1.2, Mac OS X
Merge pull request #486 from satta/splintstuff

fix splint issues