deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ID: 46 - ipmi_fwum needs some re-work

Browse Source 
KfwumGetTraceLog() - code formatting, simplification
This commit is contained in:
Zdenek Styblik 2013-10-26 19:14:43 +00:00
parent 0a4a5cafbc
commit d5d86d4dcb
1 changed files with 52 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
ipmitool/lib/ipmi_fwum.c
View File

@ -1199,21 +1199,21 @@ static const char* CMD_STATE_STRING[] = {
"Completed" }; "Completed" };
static tKFWUM_Status KfwumGetTraceLog(struct ipmi_intf * intf) static tKFWUM_Status
KfwumGetTraceLog(struct ipmi_intf *intf)
{ {
tKFWUM_Status status = KFWUM_STATUS_OK; tKFWUM_Status status = KFWUM_STATUS_OK;
struct ipmi_rs *rsp; struct ipmi_rs *rsp;
struct ipmi_rq req; struct ipmi_rq req;
unsigned char chunkIdx; unsigned char chunkIdx;
unsigned char cmdIdx; unsigned char cmdIdx;
if (verbose) {
if(verbose)
{
printf(" Getting Trace Log!\n"); printf(" Getting Trace Log!\n");
} }
for (chunkIdx = 0;
for( chunkIdx = 0; (chunkIdx < TRACE_LOG_CHUNK_COUNT) && (status == KFWUM_STATUS_OK); chunkIdx++ ) (chunkIdx < TRACE_LOG_CHUNK_COUNT)
{ && (status == KFWUM_STATUS_OK);
chunkIdx++) {
/* Retreive each log chunk and print it */ /* Retreive each log chunk and print it */
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_FIRMWARE; req.msg.netfn = IPMI_NETFN_FIRMWARE;
@ -1222,39 +1222,32 @@ static tKFWUM_Status KfwumGetTraceLog(struct ipmi_intf * intf)
req.msg.data_len = 1; req.msg.data_len = 1;
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
if (!rsp) lprintf(LOG_ERR,
{ "Error in FWUM Firmware Get Trace Log Command");
printf("Error in FWUM Firmware Get Trace Log Command\n");
status = KFWUM_STATUS_ERROR; status = KFWUM_STATUS_ERROR;
} break;
else if (rsp->ccode) } else if (rsp->ccode) {
{ lprintf(LOG_ERR,
printf("FWUM Firmware Get Trace Log returned %x\n", rsp->ccode); "FWUM Firmware Get Trace Log returned %x",
rsp->ccode);
status = KFWUM_STATUS_ERROR; status = KFWUM_STATUS_ERROR;
break;
} }
for (cmdIdx=0; cmdIdx < TRACE_LOG_CHUNK_SIZE; cmdIdx++) {
if(status == KFWUM_STATUS_OK)
{
for (cmdIdx=0; cmdIdx < TRACE_LOG_CHUNK_SIZE; cmdIdx++)
{
/* Don't diplay commands with an invalid state */ /* Don't diplay commands with an invalid state */
if ( (rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx+1] != 0) && if ((rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 1] != 0)
(rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx] < KFWUM_CMD_ID_STD_MAX_CMD)) && (rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx] < KFWUM_CMD_ID_STD_MAX_CMD)) {
{
printf(" Cmd ID: %17s -- CmdState: %10s -- CompCode: %2x\n", printf(" Cmd ID: %17s -- CmdState: %10s -- CompCode: %2x\n",
CMD_ID_STRING[rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx]], CMD_ID_STRING[rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx]],
CMD_STATE_STRING[rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx+1]], CMD_STATE_STRING[rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 1]],
rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx+2]); rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 2]);
} } else if ((rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 1] != 0)
else if ( (rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx+1] != 0) && && (rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx] >= KFWUM_CMD_ID_EXTENDED_CMD)) {
(rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx] >= KFWUM_CMD_ID_EXTENDED_CMD))
{
printf(" Cmd ID: %17s -- CmdState: %10s -- CompCode: %2x\n", printf(" Cmd ID: %17s -- CmdState: %10s -- CompCode: %2x\n",
EXT_CMD_ID_STRING[rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx] - KFWUM_CMD_ID_EXTENDED_CMD], EXT_CMD_ID_STRING[rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx] - KFWUM_CMD_ID_EXTENDED_CMD],
CMD_STATE_STRING[rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx+1]], CMD_STATE_STRING[rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 1]],
rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx+2]); rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 2]);
}
} }
} }
} }