helper/fileio: Remove nested struct

Change-Id: I1a3afbddcf950689da58e0df8850a05f558d7879
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3222
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>

6 files changed, 42 insertions, 42 deletions

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 6f4a988..d3a3ace 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -749,7 +749,7 @@ COMMAND_HANDLER(mg_write_cmd)
 {
 	uint32_t address, cnt, res, i;
 	uint8_t *buffer;
-	struct fileio fileio;
+	struct fileio *fileio;
 	int ret;
 
 	if (CMD_ARGC != 3)
@@ -764,12 +764,12 @@ COMMAND_HANDLER(mg_write_cmd)
 	size_t filesize;
 	buffer = malloc(MG_FILEIO_CHUNK);
 	if (!buffer) {
-		fileio_close(&fileio);
+		fileio_close(fileio);
 		return ERROR_FAIL;
 	}
-	int retval = fileio_size(&fileio, &filesize);
+	int retval = fileio_size(fileio, &filesize);
 	if (retval != ERROR_OK) {
-		fileio_close(&fileio);
+		fileio_close(fileio);
 		free(buffer);
 		return retval;
 	}
@@ -782,7 +782,7 @@ COMMAND_HANDLER(mg_write_cmd)
 
 	size_t buf_cnt;
 	for (i = 0; i < cnt; i++) {
-		ret = fileio_read(&fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt);
+		ret = fileio_read(fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt);
 		if (ret != ERROR_OK)
 			goto mg_write_cmd_err;
 		ret = mg_mflash_write(address, buffer, MG_FILEIO_CHUNK);
@@ -792,7 +792,7 @@ COMMAND_HANDLER(mg_write_cmd)
 	}
 
 	if (res) {
-		ret = fileio_read(&fileio, res, buffer, &buf_cnt);
+		ret = fileio_read(fileio, res, buffer, &buf_cnt);
 		if (ret != ERROR_OK)
 			goto mg_write_cmd_err;
 		ret = mg_mflash_write(address, buffer, res);
@@ -807,13 +807,13 @@ COMMAND_HANDLER(mg_write_cmd)
 	}
 
 	free(buffer);
-	fileio_close(&fileio);
+	fileio_close(fileio);
 
 	return ERROR_OK;
 
 mg_write_cmd_err:
 	free(buffer);
-	fileio_close(&fileio);
+	fileio_close(fileio);
 
 	return ret;
 }
@@ -822,7 +822,7 @@ COMMAND_HANDLER(mg_dump_cmd)
 {
 	uint32_t address, size, cnt, res, i;
 	uint8_t *buffer;
-	struct fileio fileio;
+	struct fileio *fileio;
 	int ret;
 
 	if (CMD_ARGC != 4)
@@ -837,7 +837,7 @@ COMMAND_HANDLER(mg_dump_cmd)
 
 	buffer = malloc(MG_FILEIO_CHUNK);
 	if (!buffer) {
-		fileio_close(&fileio);
+		fileio_close(fileio);
 		return ERROR_FAIL;
 	}
 
@@ -852,7 +852,7 @@ COMMAND_HANDLER(mg_dump_cmd)
 		ret = mg_mflash_read(address, buffer, MG_FILEIO_CHUNK);
 		if (ret != ERROR_OK)
 			goto mg_dump_cmd_err;
-		ret = fileio_write(&fileio, MG_FILEIO_CHUNK, buffer, &size_written);
+		ret = fileio_write(fileio, MG_FILEIO_CHUNK, buffer, &size_written);
 		if (ret != ERROR_OK)
 			goto mg_dump_cmd_err;
 		address += MG_FILEIO_CHUNK;
@@ -862,7 +862,7 @@ COMMAND_HANDLER(mg_dump_cmd)
 		ret = mg_mflash_read(address, buffer, res);
 		if (ret != ERROR_OK)
 			goto mg_dump_cmd_err;
-		ret = fileio_write(&fileio, res, buffer, &size_written);
+		ret = fileio_write(fileio, res, buffer, &size_written);
 		if (ret != ERROR_OK)
 			goto mg_dump_cmd_err;
 	}
@@ -875,13 +875,13 @@ COMMAND_HANDLER(mg_dump_cmd)
 	}
 
 	free(buffer);
-	fileio_close(&fileio);
+	fileio_close(fileio);
 
 	return ERROR_OK;
 
 mg_dump_cmd_err:
 	free(buffer);
-	fileio_close(&fileio);
+	fileio_close(fileio);
 
 	return ret;
 }
diff --git a/src/flash/nand/fileio.c b/src/flash/nand/fileio.c
index d84ef4f..085e4af 100644
--- a/src/flash/nand/fileio.c
+++ b/src/flash/nand/fileio.c
@@ -99,7 +99,7 @@ int nand_fileio_start(struct command_context *cmd_ctx,
 int nand_fileio_cleanup(struct nand_fileio_state *state)
 {
 	if (state->file_opened)
-		fileio_close(&state->fileio);
+		fileio_close(state->fileio);
 
 	if (state->oob) {
 		free(state->oob);
@@ -169,7 +169,7 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
 
 	if (!need_size) {
 		size_t filesize;
-		retval = fileio_size(&state->fileio, &filesize);
+		retval = fileio_size(state->fileio, &filesize);
 		if (retval != ERROR_OK)
 			return retval;
 		state->size = filesize;
@@ -190,7 +190,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s)
 	size_t one_read;
 
 	if (NULL != s->page) {
-		fileio_read(&s->fileio, s->page_size, s->page, &one_read);
+		fileio_read(s->fileio, s->page_size, s->page, &one_read);
 		if (one_read < s->page_size)
 			memset(s->page + one_read, 0xff, s->page_size - one_read);
 		total_read += one_read;
@@ -219,7 +219,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s)
 			ecc += 10;
 		}
 	} else if (NULL != s->oob)   {
-		fileio_read(&s->fileio, s->oob_size, s->oob, &one_read);
+		fileio_read(s->fileio, s->oob_size, s->oob, &one_read);
 		if (one_read < s->oob_size)
 			memset(s->oob + one_read, 0xff, s->oob_size - one_read);
 		total_read += one_read;
diff --git a/src/flash/nand/fileio.h b/src/flash/nand/fileio.h
index c92c644..f0483a7 100644
--- a/src/flash/nand/fileio.h
+++ b/src/flash/nand/fileio.h
@@ -37,7 +37,7 @@ struct nand_fileio_state {
 	const int *eccpos;
 
 	bool file_opened;
-	struct fileio fileio;
+	struct fileio *fileio;
 
 	struct duration bench;
 };
diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 750c1f0..d238e7a 100644
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -360,16 +360,16 @@ COMMAND_HANDLER(handle_nand_dump_command)
 		}
 
 		if (NULL != s.page)
-			fileio_write(&s.fileio, s.page_size, s.page, &size_written);
+			fileio_write(s.fileio, s.page_size, s.page, &size_written);
 
 		if (NULL != s.oob)
-			fileio_write(&s.fileio, s.oob_size, s.oob, &size_written);
+			fileio_write(s.fileio, s.oob_size, s.oob, &size_written);
 
 		s.size -= nand->page_size;
 		s.address += nand->page_size;
 	}
 
-	retval = fileio_size(&s.fileio, &filesize);
+	retval = fileio_size(s.fileio, &filesize);
 	if (retval != ERROR_OK)
 		return retval;
 
diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index 8868420..328232e 100644
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -556,7 +556,7 @@ COMMAND_HANDLER(lpc2900_handle_read_custom_command)
 	target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB);
 
 	/* Try and open the file */
-	struct fileio fileio;
+	struct fileio *fileio;
 	const char *filename = CMD_ARGV[1];
 	int ret = fileio_open(&fileio, filename, FILEIO_WRITE, FILEIO_BINARY);
 	if (ret != ERROR_OK) {
@@ -565,14 +565,14 @@ COMMAND_HANDLER(lpc2900_handle_read_custom_command)
 	}
 
 	size_t nwritten;
-	ret = fileio_write(&fileio, sizeof(customer), customer, &nwritten);
+	ret = fileio_write(fileio, sizeof(customer), customer, &nwritten);
 	if (ret != ERROR_OK) {
 		LOG_ERROR("Write operation to file %s failed", filename);
-		fileio_close(&fileio);
+		fileio_close(fileio);
 		return ret;
 	}
 
-	fileio_close(&fileio);
+	fileio_close(fileio);
 
 	return ERROR_OK;
 }
diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 8a30e1c..cf0daf3 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -555,7 +555,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
 {
 	uint32_t offset;
 	uint8_t *buffer;
-	struct fileio fileio;
+	struct fileio *fileio;
 
 	if (CMD_ARGC != 3)
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -574,22 +574,22 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
 		return ERROR_OK;
 
 	size_t filesize;
-	retval = fileio_size(&fileio, &filesize);
+	retval = fileio_size(fileio, &filesize);
 	if (retval != ERROR_OK) {
-		fileio_close(&fileio);
+		fileio_close(fileio);
 		return retval;
 	}
 
 	buffer = malloc(filesize);
 	if (buffer == NULL) {
-		fileio_close(&fileio);
+		fileio_close(fileio);
 		LOG_ERROR("Out of memory");
 		return ERROR_FAIL;
 	}
 	size_t buf_cnt;
-	if (fileio_read(&fileio, filesize, buffer, &buf_cnt) != ERROR_OK) {
+	if (fileio_read(fileio, filesize, buffer, &buf_cnt) != ERROR_OK) {
 		free(buffer);
-		fileio_close(&fileio);
+		fileio_close(fileio);
 		return ERROR_OK;
 	}
 
@@ -605,7 +605,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
 			duration_elapsed(&bench), duration_kbps(&bench, filesize));
 	}
 
-	fileio_close(&fileio);
+	fileio_close(fileio);
 
 	return retval;
 }
@@ -614,7 +614,7 @@ COMMAND_HANDLER(handle_flash_read_bank_command)
 {
 	uint32_t offset;
 	uint8_t *buffer;
-	struct fileio fileio;
+	struct fileio *fileio;
 	uint32_t length;
 	size_t written;
 
@@ -652,8 +652,8 @@ COMMAND_HANDLER(handle_flash_read_bank_command)
 		return retval;
 	}
 
-	retval = fileio_write(&fileio, length, buffer, &written);
-	fileio_close(&fileio);
+	retval = fileio_write(fileio, length, buffer, &written);
+	fileio_close(fileio);
 	free(buffer);
 	if (retval != ERROR_OK) {
 		LOG_ERROR("Could not write file");
@@ -674,7 +674,7 @@ COMMAND_HANDLER(handle_flash_verify_bank_command)
 {
 	uint32_t offset;
 	uint8_t *buffer_file, *buffer_flash;
-	struct fileio fileio;
+	struct fileio *fileio;
 	size_t read_cnt;
 	size_t filesize;
 	int differ;
@@ -698,21 +698,21 @@ COMMAND_HANDLER(handle_flash_verify_bank_command)
 		return retval;
 	}
 
-	retval = fileio_size(&fileio, &filesize);
+	retval = fileio_size(fileio, &filesize);
 	if (retval != ERROR_OK) {
-		fileio_close(&fileio);
+		fileio_close(fileio);
 		return retval;
 	}
 
 	buffer_file = malloc(filesize);
 	if (buffer_file == NULL) {
 		LOG_ERROR("Out of memory");
-		fileio_close(&fileio);
+		fileio_close(fileio);
 		return ERROR_FAIL;
 	}
 
-	retval = fileio_read(&fileio, filesize, buffer_file, &read_cnt);
-	fileio_close(&fileio);
+	retval = fileio_read(fileio, filesize, buffer_file, &read_cnt);
+	fileio_close(fileio);
 	if (retval != ERROR_OK) {
 		LOG_ERROR("File read failure");
 		free(buffer_file);