From 9e866d34edded882052c5a9c6dba0885639f3441 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 27 Jan 2017 13:31:40 +0900 Subject: [PATCH] fiptool: refactor remove_image() We need not handle the image_head as a special case. Just use a double-pointer to simplify the traverse. Signed-off-by: Masahiro Yamada --- tools/fiptool/fiptool.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/fiptool/fiptool.c b/tools/fiptool/fiptool.c index 7a5c2cd72..fef1ea832 100644 --- a/tools/fiptool/fiptool.c +++ b/tools/fiptool/fiptool.c @@ -276,20 +276,20 @@ static void free_image(image_t *image) static void remove_image(image_t *image) { - image_t *tmp = image_head, *prev; + image_t *tmp, **p = &image_head; - if (tmp == image) { - image_head = tmp->next; - free_image(tmp); - } else { - while (tmp != NULL && tmp != image) { - prev = tmp; - tmp = tmp->next; - } - assert(tmp != NULL); - prev->next = tmp->next; - free_image(tmp); + while (*p) { + if (*p == image) + break; + p = &(*p)->next; } + + assert(*p != NULL); + + tmp = *p; + *p = tmp->next; + free_image(tmp); + nr_images--; }