len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-10-13 16:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fdtoverlay: Improve error messages

Browse source 
Make several improvements to the error messages from the fdtoverlay helper
program: improve brevity, consistently quote filenames and print symbolic
errors from libfdt rather than a raw error number.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2019-06-30 15:01:01 +10:00
parent 297f5abb36
commit 6c2e61f083
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fdtoverlay.c
View file

@ -51,8 +51,7 @@ static int do_fdtoverlay(const char *input_filename,
blob = utilfdt_read(input_filename, &blob_len);
if (!blob) {
fprintf(stderr, "\nFailed to read base blob %s\n",
input_filename);
fprintf(stderr, "\nFailed to read '%s'\n", input_filename);
goto out_err;
}
if (fdt_totalsize(blob) > blob_len) {
@ -73,8 +72,7 @@ static int do_fdtoverlay(const char *input_filename,
size_t ov_len;
ovblob[i] = utilfdt_read(argv[i], &ov_len);
if (!ovblob[i]) {
fprintf(stderr, "\nFailed to read overlay %s\n",
argv[i]);
fprintf(stderr, "\nFailed to read '%s'\n", argv[i]);
goto out_err;
}
if (fdt_totalsize(ovblob[i]) > ov_len) {
@ -96,8 +94,8 @@ static int do_fdtoverlay(const char *input_filename,
for (i = 0; i < argc; i++) {
ret = fdt_overlay_apply(blob, ovblob[i]);
if (ret) {
fprintf(stderr, "\nFailed to apply %s (%d)\n",
argv[i], ret);
fprintf(stderr, "\nFailed to apply '%s': %s\n",
argv[i], fdt_strerror(ret));
goto out_err;
}
}
@ -105,8 +103,8 @@ static int do_fdtoverlay(const char *input_filename,
fdt_pack(blob);
ret = utilfdt_write(output_filename, blob);
if (ret)
fprintf(stderr, "\nFailed to write output blob %s\n",
output_filename);
fprintf(stderr, "\nFailed to write '%s'\n",
output_filename);
out_err:
if (ovblob) {