[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-343-gc6ab3abee

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  c6ab3abeeecfad4d3f48f8012b531d4172944768 (commit)
      from  21f17260d438704deb1591777222e542efb8383d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c6ab3abeeecfad4d3f48f8012b531d4172944768
Author: Marek Vrbka <mar...@co...>
Date:   Tue Sep 5 15:25:50 2023 +0200

    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 <mar...@co...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7883
    Tested-by: jenkins
    Reviewed-by: Jan Matyas <jan...@co...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/image.c b/src/target/image.c
index ad2d856b5..e998a35f4 100644
--- 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);
 

-----------------------------------------------------------------------

Summary of changes:
 src/target/image.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository