From 507ded512077c1950a3d87455138b5ab30f3012d Mon Sep 17 00:00:00 2001 From: Simon Schricker Date: Fri, 12 Jul 2019 17:14:10 +0200 Subject: [PATCH] nvme-vendor: fix c99 declarations in vendor plugins We can't use c99 declarations with older compilers. Signed-off-by: Simon Schricker --- plugins/micron/micron-nvme.c | 3 ++- plugins/toshiba/toshiba-nvme.c | 9 ++++++--- plugins/wdc/wdc-nvme.c | 11 ++++++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c index c827baef..b0762f0a 100644 --- a/plugins/micron/micron-nvme.c +++ b/plugins/micron/micron-nvme.c @@ -40,6 +40,7 @@ static int micron_selective_download(int argc, char **argv, struct command *cmd, void *fw_buf; int fd, selectNo,fw_fd,fw_size,err,offset = 0; struct stat sb; + int i; struct config { char *fw; @@ -68,7 +69,7 @@ static int micron_selective_download(int argc, char **argv, struct command *cmd, goto out; } - for(int i=0;i<3;i++) + for(i=0;i<3;i++) { cfg.select[i] = toupper(cfg.select[i]); } diff --git a/plugins/toshiba/toshiba-nvme.c b/plugins/toshiba/toshiba-nvme.c index a22a4d6b..e27653f9 100644 --- a/plugins/toshiba/toshiba-nvme.c +++ b/plugins/toshiba/toshiba-nvme.c @@ -192,10 +192,11 @@ static int d_raw_to_fd(const unsigned char *buf, unsigned len, int fd) static void progress_runner(float progress) { const size_t barWidth = 70; + size_t i; fprintf(stdout, "["); size_t pos = barWidth * progress; - for (size_t i = 0; i < barWidth; ++i) { + for (i = 0; i < barWidth; ++i) { if (i <= pos) { fprintf(stdout, "="); } else { @@ -216,6 +217,8 @@ static int nvme_get_internal_log(int fd, const char* const filename, bool curren // By trial and error it seems that the largest transfer chunk size // is 128 * 32 = 4k sectors = 2MB const __u32 max_pages = 128; + size_t i; + unsigned j; err = nvme_sct_command_transfer_log(fd, current); if (err) { fprintf(stderr, "%s: SCT command transfer failed\n", __func__); @@ -267,7 +270,7 @@ static int nvme_get_internal_log(int fd, const char* const filename, bool curren } } // Now read the rest - for (size_t i = 1; i < pages;) { + for (i = 1; i < pages;) { __u32 pages_chunk = max_pages; if (pages_chunk + i >= pages) { pages_chunk = pages - i; @@ -280,7 +283,7 @@ static int nvme_get_internal_log(int fd, const char* const filename, bool curren progress = (float) (i) / (float) (pages); progress_runner(progress); if (filename == NULL) { - for (unsigned j = 0; j < pages_chunk; ++j) { + for (j = 0; j < pages_chunk; ++j) { fprintf(stdout, "Page: %zu of %zu\n", i + j, pages); d(page_data + (j * page_data_len), page_data_len, 16, 1); } diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c index b068fc84..af453ed8 100644 --- a/plugins/wdc/wdc-nvme.c +++ b/plugins/wdc/wdc-nvme.c @@ -1312,6 +1312,7 @@ static int wdc_do_cap_dui(int fd, char *file, __u32 xfer_size, int data_area, in __u64 buffer_addr; __s64 total_size = 0; int i; + int j; bool last_xfer = false; int err = 0, output = 0; @@ -1349,13 +1350,13 @@ static int wdc_do_cap_dui(int fd, char *file, __u32 xfer_size, int data_area, in } else { /* parse log header for all sections up to specified data area inclusively */ if (data_area != WDC_NVME_DUI_MAX_DATA_AREA) { - for(int i = 0; i < WDC_NVME_DUI_MAX_SECTION_V2; i++) { - if (log_hdr_v2->log_section[i].data_area_id <= data_area && - log_hdr_v2->log_section[i].data_area_id != 0) { - log_size += log_hdr_v2->log_section[i].section_size; + for(j = 0; j < WDC_NVME_DUI_MAX_SECTION_V2; j++) { + if (log_hdr_v2->log_section[j].data_area_id <= data_area && + log_hdr_v2->log_section[j].data_area_id != 0) { + log_size += log_hdr_v2->log_section[j].section_size; if (verbose) fprintf(stderr, "%s: Data area ID %d : section size 0x%x, total size = 0x%lx\n", - __func__, log_hdr_v2->log_section[i].data_area_id, (unsigned int)log_hdr_v2->log_section[i].section_size, (long unsigned int)log_size); + __func__, log_hdr_v2->log_section[j].data_area_id, (unsigned int)log_hdr_v2->log_section[j].section_size, (long unsigned int)log_size); } else { if (verbose) -- 2.50.1