image_ihex_t -> struct image_ihex

Remove misleading typedef and redundant suffix from struct image_ihex.

diff --git a/src/target/image.c b/src/target/image.c
index e8affb6d87e6d8f786717979fe8852eb3f7a924f..60784c8bde74e3f12b691c8bd6a655136a3b79a9 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -149,7 +149,7 @@ static int identify_image_type(image_t *image, const char *type_string, const ch
 
 static int image_ihex_buffer_complete(image_t *image)
 {
-       image_ihex_t *ihex = image->type_private;
+       struct image_ihex *ihex = image->type_private;
        struct fileio *fileio = &ihex->fileio;
        uint32_t full_address = 0x0;
        uint32_t cooked_bytes;
@@ -697,9 +697,9 @@ int image_open(image_t *image, const char *url, const char *type_string)
        }
        else if (image->type == IMAGE_IHEX)
        {
-               image_ihex_t *image_ihex;
+               struct image_ihex *image_ihex;
 
-               image_ihex = image->type_private = malloc(sizeof(image_ihex_t));
+               image_ihex = image->type_private = malloc(sizeof(struct image_ihex));
 
                if ((retval = fileio_open(&image_ihex->fileio, url, FILEIO_READ, FILEIO_TEXT)) != ERROR_OK)
                {
@@ -944,7 +944,7 @@ void image_close(image_t *image)
        }
        else if (image->type == IMAGE_IHEX)
        {
-               image_ihex_t *image_ihex = image->type_private;
+               struct image_ihex *image_ihex = image->type_private;
 
                fileio_close(&image_ihex->fileio);
 

diff --git a/src/target/image.h b/src/target/image.h
index b150b90c741849f25d08feb725566eb65111b3e1..20d31518c3fbee5e6130a08b20e32bfa85839a2a 100644 (file)
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -72,11 +72,11 @@ struct image_binary
        struct fileio fileio;
 };
 
-typedef struct image_ihex_s
+struct image_ihex
 {
        struct fileio fileio;
        uint8_t *buffer;
-} image_ihex_t;
+};
 
 typedef struct image_memory_s
 {