Fixing some more c89 variable declaration issues