- Fixes '+' whitespace

[fw/openocd] / src / target / image.c

diff --git a/src/target/image.c b/src/target/image.c
index b72745b3da801d8646ca9ed9712b20d685fd2a71..40b320fad76f78b4d2cbbc56ed88fb3a832fe235 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -34,11 +34,11 @@
 
 /* convert ELF header field to host endianness */
 #define field16(elf,field)\
-       ((elf->endianness==ELFDATA2LSB)? \
+       ((elf->endianness == ELFDATA2LSB)? \
                le_to_h_u16((uint8_t*)&field):be_to_h_u16((uint8_t*)&field))
 
 #define field32(elf,field)\
-       ((elf->endianness==ELFDATA2LSB)? \
+       ((elf->endianness == ELFDATA2LSB)? \
                le_to_h_u32((uint8_t*)&field):be_to_h_u32((uint8_t*)&field))
 
 static int autodetect_image_type(image_t *image, char *url)
@@ -55,20 +55,20 @@ static int autodetect_image_type(image_t *image, char *url)
        }
        retval = fileio_read(&fileio, 9, buffer, &read_bytes);
 
-       if (retval==ERROR_OK)
+       if (retval == ERROR_OK)
        {
                if (read_bytes != 9)
                {
-                       retval=ERROR_FILEIO_OPERATION_FAILED;
+                       retval = ERROR_FILEIO_OPERATION_FAILED;
                }
        }
        fileio_close(&fileio);
 
-       if (retval!=ERROR_OK)
+       if (retval != ERROR_OK)
                return retval;
 
        /* check header against known signatures */
-       if (strncmp((char*)buffer,ELFMAG,SELFMAG)==0)
+       if (strncmp((char*)buffer,ELFMAG,SELFMAG) == 0)
        {
                LOG_DEBUG("ELF image detected.");
                image->type = IMAGE_ELF;
@@ -81,7 +81,7 @@ static int autodetect_image_type(image_t *image, char *url)
                &&(isxdigit(buffer[5]))
                &&(isxdigit(buffer[6]))
                &&(buffer[7]=='0') /* record type : 00 -> 05 */
-               &&(buffer[8]>='0')&&(buffer[8]<'6'))
+               &&(buffer[8]>='0') && (buffer[8]<'6'))
        {
                LOG_DEBUG("IHEX image detected.");
                image->type = IMAGE_IHEX;
@@ -174,7 +174,7 @@ static int image_ihex_buffer_complete(image_t *image)
                uint8_t cal_checksum = 0;
                uint32_t bytes_read = 0;
 
-               if (sscanf(&lpszLine[bytes_read], ":%2x%4x%2x", &count, &address, &record_type) != 3)
+               if (sscanf(&lpszLine[bytes_read], ":%2" SCNx32 "%4" SCNx32 "%2" SCNx32 , &count, &address, &record_type) != 3)
                {
                        return ERROR_IMAGE_FORMAT_ERROR;
                }
@@ -269,7 +269,7 @@ static int image_ihex_buffer_complete(image_t *image)
                        /* but we must consume it, and do not create an error.  */
                        while (count-- > 0)
                        {
-                               sscanf(&lpszLine[bytes_read], "%2x", &dummy);
+                               sscanf(&lpszLine[bytes_read], "%2" SCNx32 , &dummy);
                                cal_checksum += (uint8_t)dummy;
                                bytes_read += 2;
                        }
@@ -305,7 +305,7 @@ static int image_ihex_buffer_complete(image_t *image)
                {
                        uint32_t start_address;
 
-                       sscanf(&lpszLine[bytes_read], "%8x", &start_address);
+                       sscanf(&lpszLine[bytes_read], "%8" SCNx32, &start_address);
                        cal_checksum += (uint8_t)(start_address >> 24);
                        cal_checksum += (uint8_t)(start_address >> 16);
                        cal_checksum += (uint8_t)(start_address >> 8);
@@ -317,11 +317,11 @@ static int image_ihex_buffer_complete(image_t *image)
                }
                else
                {
-                       LOG_ERROR("unhandled IHEX record type: %i", record_type);
+                 LOG_ERROR("unhandled IHEX record type: %i", (int)record_type);
                        return ERROR_IMAGE_FORMAT_ERROR;
                }
 
-               sscanf(&lpszLine[bytes_read], "%2x", &checksum);
+               sscanf(&lpszLine[bytes_read], "%2" SCNx32 , &checksum);
                bytes_read += 2;
 
                if ((uint8_t)checksum != (uint8_t)(~cal_checksum + 1))
@@ -345,7 +345,7 @@ static int image_elf_read_headers(image_t *image)
 
        elf->header = malloc(sizeof(Elf32_Ehdr));
 
-       if(elf->header == NULL)
+       if (elf->header == NULL)
        {
                LOG_ERROR("insufficient memory to perform operation ");
                return ERROR_FILEIO_OPERATION_FAILED;
@@ -362,7 +362,7 @@ static int image_elf_read_headers(image_t *image)
                return ERROR_FILEIO_OPERATION_FAILED;
        }
 
-       if (strncmp((char*)elf->header->e_ident,ELFMAG,SELFMAG)!=0)
+       if (strncmp((char*)elf->header->e_ident,ELFMAG,SELFMAG) != 0)
        {
                LOG_ERROR("invalid ELF file, bad magic number");
                return ERROR_IMAGE_FORMAT_ERROR;
@@ -374,15 +374,15 @@ static int image_elf_read_headers(image_t *image)
        }
 
        elf->endianness = elf->header->e_ident[EI_DATA];
-       if ((elf->endianness!=ELFDATA2LSB)
-                &&(elf->endianness!=ELFDATA2MSB))
+       if ((elf->endianness != ELFDATA2LSB)
+                &&(elf->endianness != ELFDATA2MSB))
        {
                LOG_ERROR("invalid ELF file, unknown endianess setting");
                return ERROR_IMAGE_FORMAT_ERROR;
        }
 
        elf->segment_count = field16(elf,elf->header->e_phnum);
-       if (elf->segment_count==0)
+       if (elf->segment_count == 0)
        {
                LOG_ERROR("invalid ELF file, no program headers");
                return ERROR_IMAGE_FORMAT_ERROR;
@@ -395,7 +395,7 @@ static int image_elf_read_headers(image_t *image)
        }
 
        elf->segments = malloc(elf->segment_count*sizeof(Elf32_Phdr));
-       if(elf->segments == NULL)
+       if (elf->segments == NULL)
        {
                LOG_ERROR("insufficient memory to perform operation ");
                return ERROR_FILEIO_OPERATION_FAILED;
@@ -414,12 +414,12 @@ static int image_elf_read_headers(image_t *image)
 
        /* count useful segments (loadable), ignore BSS section */
        image->num_sections = 0;
-       for (i=0;i<elf->segment_count;i++)
+       for (i = 0;i<elf->segment_count;i++)
                if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
                        image->num_sections++;
        /* alloc and fill sections array with loadable segments */
        image->sections = malloc(image->num_sections * sizeof(image_section_t));
-       for (i=0,j=0;i<elf->segment_count;i++)
+       for (i = 0,j = 0;i<elf->segment_count;i++)
        {
                if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
                {
@@ -446,17 +446,17 @@ static int image_elf_read_section(image_t *image, int section, uint32_t offset,
 
        *size_read = 0;
 
-       LOG_DEBUG("load segment %d at 0x%x (sz=0x%x)",section,offset,size);
+       LOG_DEBUG("load segment %d at 0x%" PRIx32 " (sz = 0x%" PRIx32 ")",section,offset,size);
 
        /* read initialized data in current segment if any */
        if (offset<field32(elf,segment->p_filesz))
        {
                /* maximal size present in file for the current segment */
                read_size = MIN(size, field32(elf,segment->p_filesz)-offset);
-               LOG_DEBUG("read elf: size = 0x%x at 0x%x",read_size,
-                       field32(elf,segment->p_offset)+offset);
+               LOG_DEBUG("read elf: size = 0x%" PRIx32 " at 0x%" PRIx32 "",read_size,
+                       field32(elf,segment->p_offset) + offset);
                /* read initialized area of the segment */
-               if ((retval = fileio_seek(&elf->fileio, field32(elf,segment->p_offset)+offset)) != ERROR_OK)
+               if ((retval = fileio_seek(&elf->fileio, field32(elf,segment->p_offset) + offset)) != ERROR_OK)
                {
                        LOG_ERROR("cannot find ELF segment content, seek failed");
                        return retval;
@@ -509,7 +509,7 @@ static int image_mot_buffer_complete(image_t *image)
                uint32_t bytes_read = 0;
 
                /* get record type and record length */
-               if (sscanf(&lpszLine[bytes_read], "S%1x%2x", &record_type, &count) != 2)
+               if (sscanf(&lpszLine[bytes_read], "S%1" SCNx32 "%2" SCNx32 , &record_type, &count) != 2)
                {
                        return ERROR_IMAGE_FORMAT_ERROR;
                }
@@ -533,11 +533,11 @@ static int image_mot_buffer_complete(image_t *image)
                }
                else if (record_type >= 1 && record_type <= 3)
                {
-                       switch( record_type )
+                       switch ( record_type )
                        {
                                case 1:
                                        /* S1 - 16 bit address data record */
-                                       sscanf(&lpszLine[bytes_read], "%4x", &address);
+                                       sscanf(&lpszLine[bytes_read], "%4" SCNx32, &address);
                                        cal_checksum += (uint8_t)(address >> 8);
                                        cal_checksum += (uint8_t)address;
                                        bytes_read += 4;
@@ -546,7 +546,7 @@ static int image_mot_buffer_complete(image_t *image)
 
                                case 2:
                                        /* S2 - 24 bit address data record */
-                                       sscanf(&lpszLine[bytes_read], "%6x", &address);
+                                       sscanf(&lpszLine[bytes_read], "%6" SCNx32 , &address);
                                        cal_checksum += (uint8_t)(address >> 16);
                                        cal_checksum += (uint8_t)(address >> 8);
                                        cal_checksum += (uint8_t)address;
@@ -556,7 +556,7 @@ static int image_mot_buffer_complete(image_t *image)
 
                                case 3:
                                        /* S3 - 32 bit address data record */
-                                       sscanf(&lpszLine[bytes_read], "%8x", &address);
+                                       sscanf(&lpszLine[bytes_read], "%8" SCNx32 , &address);
                                        cal_checksum += (uint8_t)(address >> 24);
                                        cal_checksum += (uint8_t)(address >> 16);
                                        cal_checksum += (uint8_t)(address >> 8);
@@ -603,7 +603,7 @@ static int image_mot_buffer_complete(image_t *image)
 
                        while (count-- > 0)
                        {
-                               sscanf(&lpszLine[bytes_read], "%2x", &dummy);
+                               sscanf(&lpszLine[bytes_read], "%2" SCNx32 , &dummy);
                                cal_checksum += (uint8_t)dummy;
                                bytes_read += 2;
                        }
@@ -627,16 +627,16 @@ static int image_mot_buffer_complete(image_t *image)
                }
                else
                {
-                       LOG_ERROR("unhandled S19 record type: %i", record_type);
+                 LOG_ERROR("unhandled S19 record type: %i", (int)(record_type));
                        return ERROR_IMAGE_FORMAT_ERROR;
                }
 
                /* account for checksum, will always be 0xFF */
-               sscanf(&lpszLine[bytes_read], "%2x", &checksum);
+               sscanf(&lpszLine[bytes_read], "%2" SCNx32 , &checksum);
                cal_checksum += (uint8_t)checksum;
                bytes_read += 2;
 
-               if( cal_checksum != 0xFF )
+               if ( cal_checksum != 0xFF )
                {
                        /* checksum failed */
                        LOG_ERROR("incorrect record checksum found in S19 file");
@@ -762,15 +762,15 @@ int image_open(image_t *image, char *url, char *type_string)
        {
                /* relocate */
                int section;
-               for (section=0; section < image->num_sections; section++)
+               for (section = 0; section < image->num_sections; section++)
                {
-                       image->sections[section].base_address+=image->base_address;
+                       image->sections[section].base_address += image->base_address;
                }
                /* we're done relocating. The two statements below are mainly
                 * for documenation purposes: stop anyone from empirically
                 * thinking they should use these values henceforth. */
-               image->base_address=0;
-               image->base_address_set=0;
+               image->base_address = 0;
+               image->base_address_set = 0;
        }
 
        return retval;
@@ -783,7 +783,7 @@ int image_read_section(image_t *image, int section, uint32_t offset, uint32_t si
        /* don't read past the end of a section */
        if (offset + size > image->sections[section].size)
        {
-               LOG_DEBUG("read past end of section: 0x%8.8x + 0x%8.8x > 0x%8.8x",
+               LOG_DEBUG("read past end of section: 0x%8.8" PRIx32 " + 0x%8.8" PRIx32 " > 0x%8.8" PRIx32 "",
                                offset, size, image->sections[section].size);
                return ERROR_INVALID_ARGUMENTS;
        }
@@ -1017,12 +1017,12 @@ int image_calculate_checksum(uint8_t* buffer, uint32_t nbytes, uint32_t* checksu
 
        while (nbytes>0)
        {
-               int run=nbytes;
+               int run = nbytes;
                if (run>32768)
                {
-                       run=32768;
+                       run = 32768;
                }
-               nbytes-=run;
+               nbytes -= run;
                while (run--)
                {
                        /* as per gdb */