From 60a3e634299b636be7fa56beedb7377127238b49 Mon Sep 17 00:00:00 2001
From: Zdenek Styblik <zdenek.styblik@gmail.com>
Date: Fri, 11 Oct 2013 04:14:59 +0000
Subject: [PATCH] ID: 50 - ipmi_hpmfwupg needs a clean up

HpmfwupgQuerySelftestResult() - kill one level of indentation.
---
 ipmitool/lib/ipmi_hpmfwupg.c | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/ipmitool/lib/ipmi_hpmfwupg.c b/ipmitool/lib/ipmi_hpmfwupg.c
index 96e8190..57b4468 100644
--- a/ipmitool/lib/ipmi_hpmfwupg.c
+++ b/ipmitool/lib/ipmi_hpmfwupg.c
@@ -2233,26 +2233,25 @@ HpmfwupgQuerySelftestResult(struct ipmi_intf *intf, struct HpmfwupgQuerySelftest
 	} while (rsp
 			&& (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS)
 			&& (timeoutSec2 - timeoutSec1 < selfTestTimeout));
-	if (rsp) {
-		if (rsp->ccode == 0x00) {
-			memcpy(&pCtx->resp, rsp->data,
-					sizeof(struct HpmfwupgQuerySelftestResultResp));
-			if (verbose) {
-				lprintf(LOG_NOTICE, "Self test results:");
-				lprintf(LOG_NOTICE, "Result1 = %x",
-						pCtx->resp.result1);
-				lprintf(LOG_NOTICE, "Result2 = %x",
-						pCtx->resp.result2);
-			}
-		} else {
-			lprintf(LOG_NOTICE, "Error getting self test results");
-			lprintf(LOG_NOTICE, "compcode=0x%x: %s",
-					rsp->ccode,
-					val2str(rsp->ccode, completion_code_vals));
-			rc = HPMFWUPG_ERROR;
+	if (rsp == NULL) {
+		lprintf(LOG_NOTICE, "Error getting upgrade status\n");
+		return HPMFWUPG_ERROR;
+	}
+	if (rsp->ccode == 0x00) {
+		memcpy(&pCtx->resp, rsp->data,
+				sizeof(struct HpmfwupgQuerySelftestResultResp));
+		if (verbose) {
+			lprintf(LOG_NOTICE, "Self test results:");
+			lprintf(LOG_NOTICE, "Result1 = %x",
+					pCtx->resp.result1);
+			lprintf(LOG_NOTICE, "Result2 = %x",
+					pCtx->resp.result2);
 		}
 	} else {
-		lprintf(LOG_NOTICE, "Error getting upgrade status\n");
+		lprintf(LOG_NOTICE, "Error getting self test results");
+		lprintf(LOG_NOTICE, "compcode=0x%x: %s",
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
 		rc = HPMFWUPG_ERROR;
 	}
 	return rc;