openocd: fix SPDX tag format for files .c

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

diff --git a/src/target/image.c b/src/target/image.c
index df07ea3ef81edd1ada4a71852495e0185e9eac57..f8de7a23e3bb641e8d9f8930d9fd813c62813ffb 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2007 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
@@ -13,19 +15,6 @@
  *                                                                         *
  *   Copyright (C) 2018 by Advantest                                       *
  *   florian.meister@advantest.com                                         *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -337,12 +326,12 @@ static int image_ihex_buffer_complete_inner(struct image *image,
 static int image_ihex_buffer_complete(struct image *image)
 {
        char *lpsz_line = malloc(1023);
-       if (lpsz_line == NULL) {
+       if (!lpsz_line) {
                LOG_ERROR("Out of memory");
                return ERROR_FAIL;
        }
        struct imagesection *section = malloc(sizeof(struct imagesection) * IMAGE_MAX_SECTIONS);
-       if (section == NULL) {
+       if (!section) {
                free(lpsz_line);
                LOG_ERROR("Out of memory");
                return ERROR_FAIL;
@@ -374,7 +363,7 @@ static int image_elf32_read_headers(struct image *image)
 
        elf->header32 = malloc(sizeof(Elf32_Ehdr));
 
-       if (elf->header32 == NULL) {
+       if (!elf->header32) {
                LOG_ERROR("insufficient memory to perform operation");
                return ERROR_FILEIO_OPERATION_FAILED;
        }
@@ -402,7 +391,7 @@ static int image_elf32_read_headers(struct image *image)
        }
 
        elf->segments32 = malloc(elf->segment_count*sizeof(Elf32_Phdr));
-       if (elf->segments32 == NULL) {
+       if (!elf->segments32) {
                LOG_ERROR("insufficient memory to perform operation");
                return ERROR_FILEIO_OPERATION_FAILED;
        }
@@ -454,7 +443,7 @@ static int image_elf32_read_headers(struct image *image)
 
        /* alloc and fill sections array with loadable segments */
        image->sections = malloc(image->num_sections * sizeof(struct imagesection));
-       if (image->sections == NULL) {
+       if (!image->sections) {
                LOG_ERROR("insufficient memory to perform operation");
                return ERROR_FILEIO_OPERATION_FAILED;
        }
@@ -499,7 +488,7 @@ static int image_elf64_read_headers(struct image *image)
 
        elf->header64 = malloc(sizeof(Elf64_Ehdr));
 
-       if (elf->header64 == NULL) {
+       if (!elf->header64) {
                LOG_ERROR("insufficient memory to perform operation");
                return ERROR_FILEIO_OPERATION_FAILED;
        }
@@ -527,7 +516,7 @@ static int image_elf64_read_headers(struct image *image)
        }
 
        elf->segments64 = malloc(elf->segment_count*sizeof(Elf64_Phdr));
-       if (elf->segments64 == NULL) {
+       if (!elf->segments64) {
                LOG_ERROR("insufficient memory to perform operation");
                return ERROR_FILEIO_OPERATION_FAILED;
        }
@@ -579,7 +568,7 @@ static int image_elf64_read_headers(struct image *image)
 
        /* alloc and fill sections array with loadable segments */
        image->sections = malloc(image->num_sections * sizeof(struct imagesection));
-       if (image->sections == NULL) {
+       if (!image->sections) {
                LOG_ERROR("insufficient memory to perform operation");
                return ERROR_FILEIO_OPERATION_FAILED;
        }
@@ -596,7 +585,7 @@ static int image_elf64_read_headers(struct image *image)
                                image->sections[j].base_address = field64(elf,
                                                elf->segments64[i].p_paddr);
                        image->sections[j].private = &elf->segments64[i];
-                       image->sections[j].flags = field32(elf, elf->segments64[i].p_flags);
+                       image->sections[j].flags = field64(elf, elf->segments64[i].p_flags);
                        j++;
                }
        }
@@ -937,12 +926,12 @@ static int image_mot_buffer_complete_inner(struct image *image,
 static int image_mot_buffer_complete(struct image *image)
 {
        char *lpsz_line = malloc(1023);
-       if (lpsz_line == NULL) {
+       if (!lpsz_line) {
                LOG_ERROR("Out of memory");
                return ERROR_FAIL;
        }
        struct imagesection *section = malloc(sizeof(struct imagesection) * IMAGE_MAX_SECTIONS);
-       if (section == NULL) {
+       if (!section) {
                free(lpsz_line);
                LOG_ERROR("Out of memory");
                return ERROR_FAIL;
@@ -1018,7 +1007,7 @@ int image_open(struct image *image, const char *url, const char *type_string)
        } else if (image->type == IMAGE_MEMORY) {
                struct target *target = get_target(url);
 
-               if (target == NULL) {
+               if (!target) {
                        LOG_ERROR("target '%s' not defined", url);
                        return ERROR_FAIL;
                }
@@ -1168,7 +1157,7 @@ int image_read_section(struct image *image,
        return ERROR_OK;
 }
 
-int image_add_section(struct image *image, target_addr_t base, uint32_t size, int flags, uint8_t const *data)
+int image_add_section(struct image *image, target_addr_t base, uint32_t size, uint64_t flags, uint8_t const *data)
 {
        struct imagesection *section;