diff options
Diffstat (limited to 'sbin/nvmecontrol/modules/wdc/wdc.c')
| -rw-r--r-- | sbin/nvmecontrol/modules/wdc/wdc.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sbin/nvmecontrol/modules/wdc/wdc.c b/sbin/nvmecontrol/modules/wdc/wdc.c index 050458a8812f..55758dc7e037 100644 --- a/sbin/nvmecontrol/modules/wdc/wdc.c +++ b/sbin/nvmecontrol/modules/wdc/wdc.c @@ -23,9 +23,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/ioccom.h> #include <sys/endian.h> @@ -268,7 +265,7 @@ static void wdc_get_dui_log_size(int fd, uint32_t opcode, uint8_t data_area, uint64_t *log_size, int len_off) { - uint8_t *hdr; + uint8_t *hdr, *tofree; uint8_t max_sections; int i, j; uint16_t hdr_ver; @@ -277,7 +274,7 @@ wdc_get_dui_log_size(int fd, uint32_t opcode, uint8_t data_area, dui_size = 0; len = 1024; - hdr = (uint8_t*)malloc(len); + tofree = hdr = (uint8_t*)malloc(len); if (hdr == NULL) errx(EX_OSERR, "Can't get buffer to read header"); wdc_get_data_dui(fd, opcode, len, 0, hdr, len); @@ -315,7 +312,7 @@ wdc_get_dui_log_size(int fd, uint32_t opcode, uint8_t data_area, errx(EX_PROTOCOL, "ERROR : No valid header "); *log_size = dui_size; - free(hdr); + free(tofree); } static void @@ -591,7 +588,7 @@ print_hgst_info_background_scan(void *buf, uint16_t subtype __unused, uint8_t re return; } if (code != 0) { - printf("Expceted code 0, found code %#x\n", code); + printf("Expected code 0, found code %#x\n", code); return; } pom = le32dec(walker); @@ -783,7 +780,6 @@ static void print_hgst_info_log(const struct nvme_controller_data *cdata __unused, void *buf, uint32_t size __unused) { uint8_t *walker, *end, *subpage; - int pages; uint16_t len; uint8_t subtype, res; @@ -791,8 +787,7 @@ print_hgst_info_log(const struct nvme_controller_data *cdata __unused, void *buf printf("===================\n"); walker = buf; - pages = *walker++; - walker++; + walker += 2; /* Page count */ len = le16dec(walker); walker += 2; end = walker + len; /* Length is exclusive of this header */ |