constify
add rcsid
revert the previous (wrong branch)