Also add some missing $FreeBSD$ to keep svn happy.
Avoid shadowing a global variable with a function argument. Set WARNS to 6.