gcc 4.7 cleanups

Fix warnings due to -Wmaybe-uninitialized in GCC 4.7.

Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>