diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2010-12-21 11:12:30 +0000 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2010-12-21 11:12:30 +0000 |
| commit | 121f2f888e02a28e7896f84dde019cb320f0b11d (patch) | |
| tree | 99c3913759b80894b1cb83a508036223b9c98f5a /lib/qtimers.c | |
| parent | d475a0f198f880595eb27e44008e5de3aad25d73 (diff) | |
| download | quagga-121f2f888e02a28e7896f84dde019cb320f0b11d.tar.bz2 quagga-121f2f888e02a28e7896f84dde019cb320f0b11d.tar.xz | |
Creation of pipework branch
Diffstat (limited to 'lib/qtimers.c')
| -rw-r--r-- | lib/qtimers.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/qtimers.c b/lib/qtimers.c index 8c08a6bc..5c0f1518 100644 --- a/lib/qtimers.c +++ b/lib/qtimers.c @@ -213,11 +213,12 @@ qtimer_pile_dispatch_next(qtimer_pile qtp, qtime_mono_t upto) * and the process MUST be run to completion. */ qtimer -qtimer_pile_ream(qtimer_pile qtp, int free_structure) +qtimer_pile_ream(qtimer_pile qtp, free_keep_b free_structure) { qtimer qtr ; + confirm(free_it == true) ; - qtr = heap_ream_keep(&qtp->timers) ; /* ream, keeping the heap structure */ + qtr = heap_ream(&qtp->timers, keep_it) ; /* ream, keeping the heap */ if (qtr != NULL) qtr->active = false ; /* has been removed from pile */ else @@ -413,8 +414,8 @@ qtimer_pile_verify(qtimer_pile qtp) { heap th = &qtp->timers ; vector v ; - vector_index i ; - vector_index e ; + vector_index_t i ; + vector_length_t e ; qtimer qtr ; bool seen ; @@ -429,7 +430,7 @@ qtimer_pile_verify(qtimer_pile qtp) assert(th->state == Heap_Has_Backlink) ; assert(th->backlink_offset == offsetof(qtimer_t, backlink)) ; - v = &th->v ; + v = th->v ; e = vector_end(v) ; for (i = 0 ; i < e ; ++i) { |