commit 310a21ef24ace14b4d6e8095172445494f54ff25
author Rong Chang <rongchang@chromium.org> Fri Dec 09 07:59:54 2011
committer Rong Chang <rongchang@chromium.org> Wed Dec 14 01:07:51 2011
tree 33cbcef6b44783d7ece0dcb7f5bdaa49b9e29123
parent 080c7951165acb7cdfc9b372ad76d0772fa4f53d

Fix -Werror=unused-but-set-variable warnings in gcc 4.6

As warning-as-error was enabled, unused-but-set local variable
breaks the build in gcc 4.6 . This CL add a return code check in
TPM_CMK_ApproveMA after verify authorization.

BUG=None
TEST=emerge tpm-emulator under gcc 4.6 toolchain

Change-Id: I540d0a7b1b5190ab6bb4a2432e87263050ef3bc9
Reviewed-on: https://gerrit.chromium.org/gerrit/12677
Tested-by: Rong Chang <rongchang@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>

tpm/tpm_migration.c

diff --git a/tpm/tpm_migration.c b/tpm/tpm_migration.c
index f9157fc..5087696 100644
--- a/tpm/tpm_migration.c
+++ b/tpm/tpm_migration.c
@@ -389,6 +389,7 @@
   info("TPM_CMK_ApproveMA()");
   /* verify authorization */
   res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER);
+  if (res != TPM_SUCCESS) return res;
   /* create hmac of a TPM_CMK_MA_APPROVAL structure */
   buf[0] = (TPM_TAG_CMK_MA_APPROVAL >> 8) & 0xff;
   buf[1] = TPM_TAG_CMK_MA_APPROVAL & 0xff;