stardis-solver

commit e6e423a19f4bdb581259b3ca300213e300afca7c
parent fa96756ead94e2a036c3b9b21d6852fddf0fd039
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 30 Jun 2020 15:25:13 +0200

Fix the "finalization" of the green function

Some media/interfaces might be not correctly referenced by the green
function.

Diffstat:
M
src/sdis_green.c
 | 
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/sdis_green.c b/src/sdis_green.c
@@ -782,7 +782,6 @@ green_function_merge_and_clear
   size_t npaths_dst;
   size_t npaths;
   size_t i;
-  unsigned id;
   res_T res = RES_OK;
   ASSERT(dst && src);
 
@@ -808,8 +807,7 @@ green_function_merge_and_clear
   while(!htable_medium_iterator_eq(&it_medium, &end_medium)) {
     struct sdis_medium* medium;
     medium = *htable_medium_iterator_data_get(&it_medium);
-    id = medium_get_id(medium);
-    res = htable_medium_set(&dst->media, &id, &medium);
+    res = ensure_medium_registration(dst, medium);
     if(res != RES_OK) goto error;
     htable_medium_iterator_next(&it_medium);
   }
@@ -819,8 +817,7 @@ green_function_merge_and_clear
   while(!htable_interf_iterator_eq(&it_interf, &end_interf)) {
     struct sdis_interface* interf;
     interf = *htable_interf_iterator_data_get(&it_interf);
-    id = interface_get_id(interf);
-    res = htable_interf_set(&dst->interfaces, &id, &interf);
+    res = ensure_interface_registration(dst, interf);
     if(res != RES_OK) goto error;
     htable_interf_iterator_next(&it_interf);
   }