sw: -Werror=unused-but-set-variable

Change-Id: Id5bfbb2d55f8659aa3fab8a445d1f84dc4b8bb2b