image_elf_t -> struct image_elf

Remove misleading typedef and redundant suffix from struct image_elf.
__archive__
Zachary T Welch 2009-11-13 09:25:36 -08:00
parent 2ec440588f
commit d90063ffc5
2 changed files with 7 additions and 7 deletions

View File

@ -359,7 +359,7 @@ static int image_ihex_buffer_complete(image_t *image)
static int image_elf_read_headers(image_t *image) static int image_elf_read_headers(image_t *image)
{ {
image_elf_t *elf = image->type_private; struct image_elf *elf = image->type_private;
uint32_t read_bytes; uint32_t read_bytes;
uint32_t i,j; uint32_t i,j;
int retval; int retval;
@ -460,7 +460,7 @@ static int image_elf_read_headers(image_t *image)
static int image_elf_read_section(image_t *image, int section, uint32_t offset, uint32_t size, uint8_t *buffer, uint32_t *size_read) static int image_elf_read_section(image_t *image, int section, uint32_t offset, uint32_t size, uint8_t *buffer, uint32_t *size_read)
{ {
image_elf_t *elf = image->type_private; struct image_elf *elf = image->type_private;
Elf32_Phdr *segment = (Elf32_Phdr *)image->sections[section].private; Elf32_Phdr *segment = (Elf32_Phdr *)image->sections[section].private;
uint32_t read_size,really_read; uint32_t read_size,really_read;
int retval; int retval;
@ -715,9 +715,9 @@ int image_open(image_t *image, const char *url, const char *type_string)
} }
else if (image->type == IMAGE_ELF) else if (image->type == IMAGE_ELF)
{ {
image_elf_t *image_elf; struct image_elf *image_elf;
image_elf = image->type_private = malloc(sizeof(image_elf_t)); image_elf = image->type_private = malloc(sizeof(struct image_elf));
if ((retval = fileio_open(&image_elf->fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK) if ((retval = fileio_open(&image_elf->fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK)
{ {
@ -956,7 +956,7 @@ void image_close(image_t *image)
} }
else if (image->type == IMAGE_ELF) else if (image->type == IMAGE_ELF)
{ {
image_elf_t *image_elf = image->type_private; struct image_elf *image_elf = image->type_private;
fileio_close(&image_elf->fileio); fileio_close(&image_elf->fileio);

View File

@ -85,14 +85,14 @@ struct image_memory
uint32_t cache_address; uint32_t cache_address;
}; };
typedef struct fileio_elf_s struct image_elf
{ {
struct fileio fileio; struct fileio fileio;
Elf32_Ehdr *header; Elf32_Ehdr *header;
Elf32_Phdr *segments; Elf32_Phdr *segments;
uint32_t segment_count; uint32_t segment_count;
uint8_t endianness; uint8_t endianness;
} image_elf_t; };
struct image_mot struct image_mot
{ {