commit 08d0481e299c28b64a0db9bb0782ba2b551028fd
  Author: Keith Packard <keithp@keithp.com>
  Date:   Sun Dec 15 01:12:22 2013 -0800

    os: Fix -Wshadow errors

    Rename variables to avoid shadowing globals
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>