Initialize a variable in any case (kill a warning)

[simgrid.git] / src / surf / surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 7bac0d6..e4a04e7 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -1025,16 +1025,18 @@ static void convert_route_multi_to_routes(void)
   char *src_host_name, *dst_host_name, *key, *src, *dst, *val, *key_w,
     *data_w;
   const char *sep = "#";
-  xbt_dict_t set;
+  xbt_dict_t set = NULL;
   xbt_dynar_t src_names = NULL, dst_names = NULL, links;
 
   if (!route_multi_elements)
     return;
 
-  set = cpu_set;
-  DEBUG1("%d", xbt_dict_length(workstation_set));
-  if (workstation_set != NULL && xbt_dict_length(workstation_set) > 0)
-    set = workstation_set;
+  if (surf_cpu_model)
+    set = surf_model_resource_set(surf_cpu_model);
+  if (surf_workstation_model != NULL &&
+      surf_model_resource_set(surf_workstation_model) != NULL &&
+      xbt_dict_length(surf_model_resource_set(surf_workstation_model)) > 0)
+    set = surf_model_resource_set(surf_workstation_model);
 
 
   push_surfxml_bufferstack(0);