Skip to content
Snippets Groups Projects
Commit e754da2a authored by Simon Glass's avatar Simon Glass Committed by Tom Rini
Browse files

image: Move error! string to common place


The string " error\n" appears in each error string. Move it out to a
common place.

Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
Reviewed-by: default avatarMarek Vasut <marex@denx.de>
parent ab9efc66
No related branches found
No related tags found
No related merge requests found
...@@ -860,8 +860,7 @@ static int fit_image_check_hash(const void *fit, int noffset, const void *data, ...@@ -860,8 +860,7 @@ static int fit_image_check_hash(const void *fit, int noffset, const void *data,
*err_msgp = NULL; *err_msgp = NULL;
if (fit_image_hash_get_algo(fit, noffset, &algo)) { if (fit_image_hash_get_algo(fit, noffset, &algo)) {
*err_msgp = " error!\nCan't get hash algo " *err_msgp = "Can't get hash algo property";
"property";
return -1; return -1;
} }
printf("%s", algo); printf("%s", algo);
...@@ -876,22 +875,20 @@ static int fit_image_check_hash(const void *fit, int noffset, const void *data, ...@@ -876,22 +875,20 @@ static int fit_image_check_hash(const void *fit, int noffset, const void *data,
if (fit_image_hash_get_value(fit, noffset, &fit_value, if (fit_image_hash_get_value(fit, noffset, &fit_value,
&fit_value_len)) { &fit_value_len)) {
*err_msgp = " error!\nCan't get hash value " *err_msgp = "Can't get hash value property";
"property";
return -1; return -1;
} }
if (calculate_hash(data, size, algo, value, &value_len)) { if (calculate_hash(data, size, algo, value, &value_len)) {
*err_msgp = " error!\n" *err_msgp = "Unsupported hash algorithm";
"Unsupported hash algorithm";
return -1; return -1;
} }
if (value_len != fit_value_len) { if (value_len != fit_value_len) {
*err_msgp = " error !\nBad hash value len"; *err_msgp = "Bad hash value len";
return -1; return -1;
} else if (memcmp(value, fit_value, value_len) != 0) { } else if (memcmp(value, fit_value, value_len) != 0) {
*err_msgp = " error!\nBad hash value"; *err_msgp = "Bad hash value";
return -1; return -1;
} }
...@@ -920,7 +917,7 @@ int fit_image_verify(const void *fit, int image_noffset) ...@@ -920,7 +917,7 @@ int fit_image_verify(const void *fit, int image_noffset)
/* Get image data and data length */ /* Get image data and data length */
if (fit_image_get_data(fit, image_noffset, &data, &size)) { if (fit_image_get_data(fit, image_noffset, &data, &size)) {
printf("Can't get image data/size\n"); err_msg = "Can't get image data/size";
return 0; return 0;
} }
...@@ -945,14 +942,14 @@ int fit_image_verify(const void *fit, int image_noffset) ...@@ -945,14 +942,14 @@ int fit_image_verify(const void *fit, int image_noffset)
} }
if (noffset == -FDT_ERR_TRUNCATED || noffset == -FDT_ERR_BADSTRUCTURE) { if (noffset == -FDT_ERR_TRUNCATED || noffset == -FDT_ERR_BADSTRUCTURE) {
err_msg = " error!\nCorrupted or truncated tree"; err_msg = "Corrupted or truncated tree";
goto error; goto error;
} }
return 1; return 1;
error: error:
printf("%s for '%s' hash node in '%s' image node\n", printf(" error!\n%s for '%s' hash node in '%s' image node\n",
err_msg, fit_get_name(fit, noffset, NULL), err_msg, fit_get_name(fit, noffset, NULL),
fit_get_name(fit, image_noffset, NULL)); fit_get_name(fit, image_noffset, NULL));
return 0; return 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment