From a9ee361f27e0439530387765924574e5358c8a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 10 Sep 2022 15:44:41 +0200 Subject: New upstream version 1.8.19 --- lib/ipmi_kontronoem.c | 75 +++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 38 deletions(-) (limited to 'lib/ipmi_kontronoem.c') diff --git a/lib/ipmi_kontronoem.c b/lib/ipmi_kontronoem.c index 64860be..16e6014 100644 --- a/lib/ipmi_kontronoem.c +++ b/lib/ipmi_kontronoem.c @@ -60,8 +60,7 @@ static void ipmi_kontron_help(void); static int ipmi_kontron_set_serial_number(struct ipmi_intf *intf); static int ipmi_kontron_set_mfg_date (struct ipmi_intf *intf); static void ipmi_kontron_nextboot_help(void); -static int ipmi_kontron_nextboot_set(struct ipmi_intf *intf, int argc, - char **argv); +static int ipmi_kontron_nextboot_set(struct ipmi_intf *intf, char **argv); static int ipmi_kontronoem_send_set_large_buffer(struct ipmi_intf *intf, unsigned char channel, unsigned char size); @@ -76,38 +75,38 @@ ipmi_kontronoem_main(struct ipmi_intf *intf, int argc, char **argv) ipmi_kontron_help(); return (-1); } - if (strncmp(argv[0], "help", 4) == 0) { + if (!strcmp(argv[0], "help")) { ipmi_kontron_help(); rc = 0; - } else if (!strncmp(argv[0], "setsn", 5)) { + } else if (!strcmp(argv[0], "setsn")) { if (argc < 1) { printf("fru setsn\n"); return (-1); } if (ipmi_kontron_set_serial_number(intf) > 0) { - printf("FRU serial number setted successfully\n"); + printf("FRU serial number set successfully\n"); } else { printf("FRU serial number set failed\n"); rc = (-1); } - } else if (!strncmp(argv[0], "setmfgdate", 10)) { + } else if (!strcmp(argv[0], "setmfgdate")) { if (argc < 1) { printf("fru setmfgdate\n"); return (-1); } if (ipmi_kontron_set_mfg_date(intf) > 0) { - printf("FRU manufacturing date setted successfully\n"); + printf("FRU manufacturing date set successfully\n"); } else { printf("FRU manufacturing date set failed\n"); rc = (-1); } - } else if (!strncmp(argv[0], "nextboot", 8)) { + } else if (!strcmp(argv[0], "nextboot")) { if (argc < 2) { lprintf(LOG_ERR, "Not enough parameters given."); ipmi_kontron_nextboot_help(); return (-1); } - rc = ipmi_kontron_nextboot_set(intf, (argc - 1), (argv + 1)); + rc = ipmi_kontron_nextboot_set(intf, (argv + 1)); if (rc == 0) { printf("Nextboot set successfully\n"); } else { @@ -188,10 +187,10 @@ ipmi_kontronoem_send_set_large_buffer(struct ipmi_intf *intf, req.msg.data_len = 2; req.msg.lun = 0x00; rsp = intf->sendrecv(intf, &req); - if (rsp == NULL) { + if (!rsp) { printf("Cannot send large buffer command\n"); return(-1); - } else if (rsp->ccode > 0) { + } else if (rsp->ccode) { printf("Invalid length for the selected interface (%s) %d\n", val2str(rsp->ccode, completion_code_vals), rsp->ccode); return(-1); @@ -243,16 +242,16 @@ ipmi_kontron_set_serial_number(struct ipmi_intf *intf) /* Set Lun, necessary for this oem command */ req.msg.lun = 0x03; rsp = intf->sendrecv(intf, &req); - if (rsp == NULL) { + if (!rsp) { printf(" Device not present (No Response)\n"); return (-1); - } else if (rsp->ccode > 0) { + } else if (rsp->ccode) { printf(" This option is not implemented for this board\n"); return (-1); } sn_size = rsp->data_len; sn = malloc(sn_size + 1); - if (sn == NULL) { + if (!sn) { lprintf(LOG_ERR, "ipmitool: malloc failure"); return (-1); } @@ -269,12 +268,12 @@ ipmi_kontron_set_serial_number(struct ipmi_intf *intf) req.msg.data = msg_data; req.msg.data_len = 1; rsp = intf->sendrecv(intf, &req); - if (rsp == NULL) { + if (!rsp) { printf(" Device not present (No Response)\n"); free(sn); sn = NULL; return (-1); - } else if (rsp->ccode > 0) { + } else if (rsp->ccode) { printf(" Device not present (%s)\n", val2str(rsp->ccode, completion_code_vals)); free(sn); @@ -302,12 +301,12 @@ ipmi_kontron_set_serial_number(struct ipmi_intf *intf) req.msg.data = msg_data; req.msg.data_len = 4; rsp = intf->sendrecv(intf, &req); - if (rsp == NULL) { + if (!rsp) { printf(" Device not present (No Response)\n"); free(sn); sn = NULL; return (-1); - } else if (rsp->ccode > 0) { + } else if (rsp->ccode) { printf(" Device not present (%s)\n", val2str(rsp->ccode, completion_code_vals)); free(sn); @@ -328,7 +327,7 @@ ipmi_kontron_set_serial_number(struct ipmi_intf *intf) /* Set the Board Section */ board_sec_len = (header.offset.product * 8) - (header.offset.board * 8); fru_data = malloc(fru.size); - if (fru_data == NULL) { + if (!fru_data) { lprintf(LOG_ERR, "ipmitool: malloc failure"); free(sn); sn = NULL; @@ -346,20 +345,20 @@ ipmi_kontron_set_serial_number(struct ipmi_intf *intf) /* Position at Board Manufacturer */ fru_data_offset = (header.offset.board * 8) + 6; fru_area = get_fru_area_str(fru_data, &fru_data_offset); - if (fru_area != NULL) { + if (fru_area) { free(fru_area); fru_area = NULL; } /* Position at Board Product Name */ fru_area = get_fru_area_str(fru_data, &fru_data_offset); - if (fru_area != NULL) { + if (fru_area) { free(fru_area); fru_area = NULL; } fru_data_offset_tmp = fru_data_offset; /* Position at Serial Number */ fru_area = get_fru_area_str(fru_data, &fru_data_offset_tmp); - if (fru_area == NULL) { + if (!fru_area) { lprintf(LOG_ERR, "Failed to read FRU Area string."); free(fru_data); fru_data = NULL; @@ -420,32 +419,32 @@ ipmi_kontron_set_serial_number(struct ipmi_intf *intf) /* Position at Product Manufacturer */ fru_data_offset = (header.offset.product * 8) + 3; fru_area = get_fru_area_str(fru_data, &fru_data_offset); - if (fru_area != NULL) { + if (fru_area) { free(fru_area); fru_area = NULL; } /* Position at Product Name */ fru_area = get_fru_area_str(fru_data, &fru_data_offset); - if (fru_area != NULL) { + if (fru_area) { free(fru_area); fru_area = NULL; } /* Position at Product Part */ fru_area = get_fru_area_str(fru_data, &fru_data_offset); - if (fru_area != NULL) { + if (fru_area) { free(fru_area); fru_area = NULL; } /* Position at Product Version */ fru_area = get_fru_area_str(fru_data, &fru_data_offset); - if (fru_area != NULL) { + if (fru_area) { free(fru_area); fru_area = NULL; } fru_data_offset_tmp = fru_data_offset; /* Position at Serial Number */ fru_area = get_fru_area_str(fru_data, &fru_data_offset_tmp); - if (fru_area == NULL) { + if (!fru_area) { lprintf(LOG_ERR, "Failed to read FRU Area string."); free(sn); sn = NULL; @@ -532,10 +531,10 @@ ipmi_kontron_set_mfg_date (struct ipmi_intf *intf) /* Set Lun temporary, necessary for this oem command */ req.msg.lun = 0x03; rsp = intf->sendrecv(intf, &req); - if (rsp == NULL) { + if (!rsp) { printf("Device not present (No Response)\n"); return(-1); - } else if (rsp->ccode > 0) { + } else if (rsp->ccode) { printf("This option is not implemented for this board\n"); return(-1); } @@ -554,10 +553,10 @@ ipmi_kontron_set_mfg_date (struct ipmi_intf *intf) req.msg.data = msg_data; req.msg.data_len = 1; rsp = intf->sendrecv(intf, &req); - if (rsp == NULL) { + if (!rsp) { printf(" Device not present (No Response)\n"); return(-1); - } else if (rsp->ccode > 0) { + } else if (rsp->ccode) { printf(" Device not present (%s)\n", val2str(rsp->ccode, completion_code_vals)); return(-1); @@ -582,10 +581,10 @@ ipmi_kontron_set_mfg_date (struct ipmi_intf *intf) req.msg.data = msg_data; req.msg.data_len = 4; rsp = intf->sendrecv(intf, &req); - if (rsp == NULL) { + if (!rsp) { printf(" Device not present (No Response)\n"); return (-1); - } else if (rsp->ccode > 0) { + } else if (rsp->ccode) { printf(" Device not present (%s)\n", val2str(rsp->ccode, completion_code_vals)); return (-1); @@ -601,7 +600,7 @@ ipmi_kontron_set_mfg_date (struct ipmi_intf *intf) } board_sec_len = (header.offset.product * 8) - (header.offset.board * 8); fru_data = malloc(fru.size); - if(fru_data == NULL) { + if (!fru_data) { lprintf(LOG_ERR, "ipmitool: malloc failure"); return(-1); } @@ -656,7 +655,7 @@ ipmi_kontron_nextboot_help(void) * returns 1 if successful */ static int -ipmi_kontron_nextboot_set(struct ipmi_intf *intf, int argc, char **argv) +ipmi_kontron_nextboot_set(struct ipmi_intf *intf, char **argv) { struct ipmi_rs *rsp; struct ipmi_rq req; @@ -672,7 +671,7 @@ ipmi_kontron_nextboot_set(struct ipmi_intf *intf, int argc, char **argv) msg_data[5] = 0xFF; msg_data[6] = 0xFF; /* any */ for (i = 0; bootdev[i] != 0; i++) { - if (strcmp(argv[0], bootdev[i]) == 0) { + if (!strcmp(argv[0], bootdev[i])) { msg_data[5] = i; break; } @@ -690,10 +689,10 @@ ipmi_kontron_nextboot_set(struct ipmi_intf *intf, int argc, char **argv) /* Set Lun temporary, necessary for this oem command */ req.msg.lun = 0x03; rsp = intf->sendrecv(intf, &req); - if (rsp == NULL) { + if (!rsp) { printf("Device not present (No Response)\n"); return(-1); - } else if (rsp->ccode > 0) { + } else if (rsp->ccode) { printf("Device not present (%s)\n", val2str(rsp->ccode, completion_code_vals)); return (-1); -- cgit v1.2.3