remove old svn keywords
add missing volatile