auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fileio: refactor struct fileio to be an opaque structure

Browse Source 
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe
2010-09-28 15:37:56 +02:00
parent ecad76061f
commit 3a693ef526
9 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/target/etm.c
View File

@@ -1897,7 +1897,7 @@ COMMAND_HANDLER(handle_etm_load_command)
return ERROR_FAIL;
}
if (file.size % 4)
if (fileio_size(&file) % 4)
{
command_print(CMD_CTX, "size isn't a multiple of 4, no valid trace data");
fileio_close(&file);

6
src/target/image.c
View File

@@ -158,7 +158,7 @@ static int image_ihex_buffer_complete_inner(struct image *image, char *lpszLine,
/* we can't determine the number of sections that we'll have to create ahead of time,
* so we locally hold them until parsing is finished */
ihex->buffer = malloc(fileio->size >> 1);
ihex->buffer = malloc(fileio_size(fileio) >> 1);
cooked_bytes = 0x0;
image->num_sections = 0;
section[image->num_sections].private = &ihex->buffer[cooked_bytes];
@@ -537,7 +537,7 @@ static int image_mot_buffer_complete_inner(struct image *image, char *lpszLine,
/* we can't determine the number of sections that we'll have to create ahead of time,
* so we locally hold them until parsing is finished */
mot->buffer = malloc(fileio->size >> 1);
mot->buffer = malloc(fileio_size(fileio) >> 1);
cooked_bytes = 0x0;
image->num_sections = 0;
section[image->num_sections].private = &mot->buffer[cooked_bytes];
@@ -747,7 +747,7 @@ int image_open(struct image *image, const char *url, const char *type_string)
image->num_sections = 1;
image->sections = malloc(sizeof(struct imagesection));
image->sections[0].base_address = 0x0;
image->sections[0].size = image_binary->fileio.size;
image->sections[0].size = fileio_size(&image_binary->fileio);
image->sections[0].flags = 0;
}
else if (image->type == IMAGE_IHEX)

4
src/target/target.c
View File

@@ -2649,8 +2649,8 @@ COMMAND_HANDLER(handle_dump_image_command)
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
command_print(CMD_CTX,
"dumped %ld bytes in %fs (%0.3f KiB/s)", (long)fileio.size,
duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
"dumped %ld bytes in %fs (%0.3f KiB/s)", (long)fileio_size(&fileio),
duration_elapsed(&bench), duration_kbps(&bench, fileio_size(&fileio)));
}
return retval;