image_memory_t -> struct image_memory

Remove misleading typedef and redundant suffix from struct image_memory.

diff --git a/src/target/image.c b/src/target/image.c
index 60784c8bde74e3f12b691c8bd6a655136a3b79a9..fbd5d7e78154e64e3897bb58b32cfffa27517fbb 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -740,7 +740,7 @@ int image_open(image_t *image, const char *url, const char *type_string)
                        return ERROR_FAIL;
                }
 
                        return ERROR_FAIL;
                }
 

-               image_memory_t *image_memory;
+               struct image_memory *image_memory;

 
                image->num_sections = 1;
                image->sections = malloc(sizeof(struct image_section));
 
                image->num_sections = 1;
                image->sections = malloc(sizeof(struct image_section));


@@ -748,7 +748,7 @@ int image_open(image_t *image, const char *url, const char *type_string)
                image->sections[0].size = 0xffffffff;
                image->sections[0].flags = 0;
 
                image->sections[0].size = 0xffffffff;
                image->sections[0].flags = 0;
 

-               image_memory = image->type_private = malloc(sizeof(image_memory_t));
+               image_memory = image->type_private = malloc(sizeof(struct image_memory));

 
                image_memory->target = target;
                image_memory->cache = NULL;
 
                image_memory->target = target;
                image_memory->cache = NULL;


@@ -842,7 +842,7 @@ int image_read_section(image_t *image, int section, uint32_t offset, uint32_t si
        }
        else if (image->type == IMAGE_MEMORY)
        {
        }
        else if (image->type == IMAGE_MEMORY)
        {

-               image_memory_t *image_memory = image->type_private;
+               struct image_memory *image_memory = image->type_private;

                uint32_t address = image->sections[section].base_address + offset;
 
                *size_read = 0;
                uint32_t address = image->sections[section].base_address + offset;
 
                *size_read = 0;


@@ -974,7 +974,7 @@ void image_close(image_t *image)
        }
        else if (image->type == IMAGE_MEMORY)
        {
        }
        else if (image->type == IMAGE_MEMORY)
        {

-               image_memory_t *image_memory = image->type_private;
+               struct image_memory *image_memory = image->type_private;

 
                if (image_memory->cache)
                {
 
                if (image_memory->cache)
                {

diff --git a/src/target/image.h b/src/target/image.h
index 20d31518c3fbee5e6130a08b20e32bfa85839a2a..5969ddebaa09242f775cf34e76fc76d91ea10511 100644 (file)
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -78,12 +78,12 @@ struct image_ihex
        uint8_t *buffer;
 };
 
        uint8_t *buffer;
 };
 

-typedef struct image_memory_s
+struct image_memory

 {
        struct target_s *target;
        uint8_t *cache;
        uint32_t cache_address;
 {
        struct target_s *target;
        uint8_t *cache;
        uint32_t cache_address;

-} image_memory_t;
+};

 
 typedef struct fileio_elf_s
 {
 
 typedef struct fileio_elf_s
 {