*/
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;
+ unsigned int id;
+ unsigned int 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 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);