From d90063ffc54ea042c0ff37e6cec1e95848bf1e26 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 13 Nov 2009 09:25:36 -0800 Subject: [PATCH] image_elf_t -> struct image_elf Remove misleading typedef and redundant suffix from struct image_elf. --- src/target/image.c | 10 +++++----- src/target/image.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/target/image.c b/src/target/image.c index 608ac59d..27d8eca5 100644 --- a/src/target/image.c +++ b/src/target/image.c @@ -359,7 +359,7 @@ static int image_ihex_buffer_complete(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 i,j; 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) { - image_elf_t *elf = image->type_private; + struct image_elf *elf = image->type_private; Elf32_Phdr *segment = (Elf32_Phdr *)image->sections[section].private; uint32_t read_size,really_read; 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) { - 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) { @@ -956,7 +956,7 @@ void image_close(image_t *image) } 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); diff --git a/src/target/image.h b/src/target/image.h index 608336bb..0180420c 100644 --- a/src/target/image.h +++ b/src/target/image.h @@ -85,14 +85,14 @@ struct image_memory uint32_t cache_address; }; -typedef struct fileio_elf_s +struct image_elf { struct fileio fileio; Elf32_Ehdr *header; Elf32_Phdr *segments; uint32_t segment_count; uint8_t endianness; -} image_elf_t; +}; struct image_mot { -- 2.39.5