Merge pull request #532 from simson-suse/master

nvme-vendor: fix c99 declarations in vendor plugins

Author: Keith Busch

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]);
     }

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);
 			}

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)