From 2d447298d9041e42cd25b0163631ca9403101751 Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Fri, 6 Aug 2010 12:30:17 +0200 Subject: [PATCH] [Aggregator] Rewrite free_couple_list() --- .../owlps-aggregator/owlps-aggregatord.c | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c b/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c index 68d4097..7049aed 100644 --- a/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c +++ b/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c @@ -578,24 +578,20 @@ void got_couple_info(couple_message message) /* Empty the couple list */ void free_couple_list() { - couple_list *couple_ptr = couples ; - couple_info_list *couple_info_ptr = NULL ; + couple_list *next_couple ; + couple_info_list *next_couple_info ; - if (*couples != NULL) + while (couples != NULL) { - while (couple_ptr != NULL) - { - couple_info_ptr = couple_ptr->info ; - while (couple_info_ptr != NULL) - { - couple_info_ptr = couple_info_ptr->next ; - free(couple_ptr->info) ; - couple_ptr->info = couple_info_ptr ; - } - couple_ptr = couple_ptr->next ; - free(couples) ; - couples = couple_ptr ; - } + while (couples->info != NULL) + { + next_couple_info = couples->info->next ; + free(couples->info) ; + couples->info = next_couple_info ; + } + next_couple = couples->next ; + free(couples) ; + couples = next_couple ; } }