Make source cleah with cppcheck, except for mpc and sasl
Oops, fixed error in util.c
Merge pull request #368 from RichardHitt/pull360

Make source clean with cppcheck, except for mpc and sasl, closes #360