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 <yamada.masahiro@socionext.com>
diff --git a/tools/fiptool/fiptool.c b/tools/fiptool/fiptool.c
index 7a5c2cd..fef1ea8 100644
--- a/tools/fiptool/fiptool.c
+++ b/tools/fiptool/fiptool.c
@@ -276,20 +276,20 @@
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--;
}
