Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2430 → Rev 2431

/branches/rcu/kernel/generic/src/time/timeout.c
1,5 → 1,6
/*
* Copyright (C) 2001-2004 Jakub Jermar
* Copyright (C) 2007 Vojtech Mencl
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/branches/rcu/kernel/generic/src/adt/extavl.c
163,7 → 163,7
newnode->par = cur;
gpa = cur;
while (gpa != &t->head && gpa->key == cur->key)
while ((gpa != &t->head) && (gpa->key == cur->key))
gpa = gpa->prev;
newnode->next = gpa->next;
newnode->prev = gpa;
403,7 → 403,7
}
if (&t->head != node->prev && node->prev->key == node->key) {
if ((&t->head != node->prev) && (node->prev->key == node->key)) {
/*
* Deleted node has at least one node node with the same key which is closest previous
* neighbor in the list, copy node atributes into previous node and end.
747,6 → 747,11
expnode->par->lft = NULL;
expnode->par->lft_height = 0;
}
} else if (expnode->next == &t->head) {
/*
* Special case of deleting last node with key equal 0.
*/
t->root = NULL;
}
 
/*
/branches/rcu/kernel/generic/src/adt/extavlrel.c
1017,6 → 1017,11
expnode->par->lft_height = 0;
}
nextnode->key += expnode->key;
} else {
/*
* Delete last node in tree.
*/
t->root = NULL;
}
 
/*