static int network_card_new(const char *card_name)
{
- network_card_DASSF_t card = NULL;
-
- xbt_dict_get(network_card_set, card_name, (void *) &card);
+ network_card_DASSF_t card = xbt_dict_get_or_null(network_card_set, card_name);
if (!card) {
card = xbt_new0(s_network_card_DASSF_t, 1);
ROUTE_SIZE(src_id, dst_id) = nb_link;
link_list = (ROUTE(src_id, dst_id) = xbt_new0(network_link_DASSF_t, nb_link));
for (i = 0; i < nb_link; i++) {
- xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
+ link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]);
free(links[i]);
}
free(links);
static void *name_service(const char *name)
{
- network_card_DASSF_t card = NULL;
-
- xbt_dict_get(network_card_set, name, (void *) &card);
-
- return card;
+ return xbt_dict_get_or_null(network_card_set, name);
}
static const char *get_resource_name(void *resource_id)
surf_action_network_DASSF_t next_action = NULL;
xbt_swag_t running_actions =
surf_network_resource->common_public->states.running_action_set;
+ /* KILLME: unused
xbt_swag_t failed_actions =
surf_network_resource->common_public->states.failed_action_set;
+ */
xbt_swag_foreach_safe(action, next_action, running_actions) {
deltap = delta;