diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2019-06-30 15:01:01 +1000 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2019-06-30 15:47:50 +1000 |
| commit | 6c2e61f08396871a34d641b8f18a05d35d552792 (patch) | |
| tree | 201a908db7995f26ea8944a98d4c90c7aae50883 | |
| parent | 297f5abb362e4844ee313fdcd342fa4912e9894d (diff) | |
| download | device-tree-compiler-6c2e61f08396871a34d641b8f18a05d35d552792.tar.gz | |
fdtoverlay: Improve error messages
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>
| -rw-r--r-- | fdtoverlay.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fdtoverlay.c b/fdtoverlay.c index b2ac2e7..40c249e 100644 --- a/fdtoverlay.c +++ b/fdtoverlay.c @@ -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) { |