mkimage: Skip adding non-existent IDs to a list
PATCH 2/3 mkimage: Skip adding non-existent IDs to a list
In show_valid_options(), this patch introduces checking whether a category has an entry ID. If not, adding it to a list for output is skipped before calling qsort().
This patch will affect all kinds of image header categories (-A, -C, -O and -T flags).
---
tools/mkimage.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
tools/mkimage.c +7 -2
@@ -51,8 +51,13 @@ static int show_valid_options(enum ih_category category)return -ENOMEM ;/* Sort the names in order of short name for easier reading */ -for (item =0 ; item < count; item++) - order[item] = item; +for (i =0 , item =0 ; i < count; i++, item++) { +while (!genimg_cat_has_id (category, item) && i < count) { + item++; + count--; + } + order[i] = item; + } cur_category = category;qsort (order, count,sizeof (int ), h_compare_category_name);
Signature · 1 line
2.17.1
PATCH 2/3 mkimage: Skip adding non-existent IDs to a list
Quoted 7 lines · Naoki Hayama
In
show_valid_options(), this patch introduces checking whether a category has an entry ID. If not, adding it to a list for output is skipped before callingqsort().
This patch will affect all kinds of image header categories (-A, -C, -O and -T flags).
Quoted 5 lines
Signed-off-by Naoki Hayama <[email protected]>---
tools/mkimage.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
PATCH 2/3 mkimage: Skip adding non-existent IDs to a list
In reply to Naoki HayamaQuoted 8 lines · Naoki Hayama
In
show_valid_options(), this patch introduces checking whether a category has an entry ID. If not, adding it to a list for output is skipped before callingqsort().
This patch will affect all kinds of image header categories (-A, -C, -O and -T flags).Signed-off-by Naoki Hayama <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/0158999f/attachment.sig>