image: log error when unknown image type is specified

This patch adds error reporting when unknown image type is specified.
Previously, OpenOCD replied with an empty string.

Change-Id: I16220b1f5deb3b966a21731f0adf7911a78e8959
Signed-off-by: Marek Vrbka <marek.vrbka@codasip.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7883
Tested-by: jenkins
Reviewed-by: Jan Matyas <jan.matyas@codasip.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>

diff --git a/src/target/image.c b/src/target/image.c
index ad2d856b54f0aba0c9252c9dd9e12bdf059ec353..e998a35f4d55f4e9939f43714917acab3726136e 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -96,20 +96,22 @@ static int autodetect_image_type(struct image *image, const char *url)
 static int identify_image_type(struct image *image, const char *type_string, const char *url)
 {
        if (type_string) {
-               if (!strcmp(type_string, "bin"))
+               if (!strcmp(type_string, "bin")) {
                        image->type = IMAGE_BINARY;
-               else if (!strcmp(type_string, "ihex"))
+               } else if (!strcmp(type_string, "ihex")) {
                        image->type = IMAGE_IHEX;
-               else if (!strcmp(type_string, "elf"))
+               } else if (!strcmp(type_string, "elf")) {
                        image->type = IMAGE_ELF;
-               else if (!strcmp(type_string, "mem"))
+               } else if (!strcmp(type_string, "mem")) {
                        image->type = IMAGE_MEMORY;
-               else if (!strcmp(type_string, "s19"))
+               } else if (!strcmp(type_string, "s19")) {
                        image->type = IMAGE_SRECORD;
-               else if (!strcmp(type_string, "build"))
+               } else if (!strcmp(type_string, "build")) {
                        image->type = IMAGE_BUILDER;
-               else
+               } else {
+                       LOG_ERROR("Unknown image type: %s, use one of: bin, ihex, elf, mem, s19, build", type_string);
                        return ERROR_IMAGE_TYPE_UNKNOWN;
+               }
        } else
                return autodetect_image_type(image, url);