-/* Copyright (c) 2012-2014. The SimGrid Team.
+/* Copyright (c) 2012-2018. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
{
unsigned int cpt;
node_contact_t contact;
- XBT_INFO("Searching %08x, size %d", answer->destination_id, answer->size);
+ XBT_INFO("Searching %08x, size %u", answer->destination_id, answer->size);
xbt_dynar_foreach(answer->nodes, cpt, contact) {
- XBT_INFO("Node %08x: %08x is at distance %d", cpt, contact->id, contact->distance);
+ XBT_INFO("Node %08x: %08x is at distance %u", cpt, contact->id, contact->distance);
}
}
*/
unsigned int answer_merge(answer_t destination, answer_t source)
{
- node_contact_t contact, contact_copy;
+ node_contact_t contact;
+ node_contact_t contact_copy;
unsigned int cpt;
unsigned int nb_added = 0;
/* TODO: Check if same destination */
xbt_dynar_foreach(source->nodes, cpt, contact) {
- if (!answer_contains(destination, contact->id)) {
+ if (answer_contains(destination, contact->id) == 0) {
contact_copy = node_contact_copy(contact);
xbt_dynar_push(destination->nodes, &contact_copy);
destination->size++;
*/
void answer_add_bucket(bucket_t bucket, answer_t answer)
{
- unsigned int cpt;
- unsigned int id, distance;
- node_contact_t contact;
xbt_assert((bucket != NULL), "Provided a NULL bucket");
xbt_assert((bucket->nodes != NULL), "Provided a bucket which nodes are NULL");
+
+ unsigned int cpt;
+ unsigned int id;
xbt_dynar_foreach(bucket->nodes, cpt, id) {
- distance = id ^ answer->destination_id;
- contact = node_contact_new(id, distance);
+ unsigned int distance = id ^ answer->destination_id;
+ node_contact_t contact = node_contact_new(id, distance);
xbt_dynar_push(answer->nodes, &contact);
answer->size++;
}
*/
unsigned int answer_destination_found(answer_t answer)
{
- if (xbt_dynar_length(answer->nodes) < 1) {
+ if (xbt_dynar_is_empty(answer->nodes)) {
return 0;
}
node_contact_t contact_tail = xbt_dynar_get_as(answer->nodes, 0, node_contact_t);