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: 50 - ipmi_hpmfwupg needs a clean up

Browse Source 
HpmfwupgGetDeviceId() - simplify function.
This commit is contained in:
Zdenek Styblik 2013-10-10 10:37:46 +00:00
parent 29af592773
commit 942dcb71d8
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ipmitool/lib/ipmi_hpmfwupg.c
View File

@ -1566,7 +1566,6 @@ HpmfwupgGetBufferFromFile(char *imageFilename,
int
HpmfwupgGetDeviceId(struct ipmi_intf *intf, struct ipm_devid_rsp *pGetDevId)
{
int rc = HPMFWUPG_SUCCESS;
struct ipmi_rs *rsp;
struct ipmi_rq req;
memset(&req, 0, sizeof(req));
@ -1574,21 +1573,19 @@ HpmfwupgGetDeviceId(struct ipmi_intf *intf, struct ipm_devid_rsp *pGetDevId)
req.msg.cmd = BMC_GET_DEVICE_ID;
req.msg.data_len = 0;
rsp = HpmfwupgSendCmd(intf, req, NULL);
if (rsp) {
if (rsp->ccode == 0x00) {
memcpy(pGetDevId, rsp->data, sizeof(struct ipm_devid_rsp));
} else {
lprintf(LOG_NOTICE, "Error getting device ID");
lprintf(LOG_NOTICE, "compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR;
}
} else {
lprintf(LOG_NOTICE, "Error getting device ID\n");
rc = HPMFWUPG_ERROR;
if (rsp == NULL) {
lprintf(LOG_ERR, "Error getting device ID.");
return HPMFWUPG_ERROR;
}
return rc;
if (rsp->ccode != 0x00) {
lprintf(LOG_ERR, "Error getting device ID.");
lprintf(LOG_ERR, "compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
return HPMFWUPG_ERROR;
}
memcpy(pGetDevId, rsp->data, sizeof(struct ipm_devid_rsp));
return HPMFWUPG_SUCCESS;
}
int