#include "libpspp/ll.h"
-#include <assert.h>
/* Returns the number of nodes in LIST (not counting the null
node). Executes in O(n) time in the length of the list. */
size_t count;
count = 0;
- for (x = r0; x != r1; )
+ for (x = r0; x != r1;)
if (compare (x, target, aux) == 0)
{
x = ll_remove (x);
size_t count;
count = 0;
- for (x = r0; x != r1; )
+ for (x = r0; x != r1;)
if (predicate (x, aux))
{
x = ll_remove (x);
ll_sort (struct ll *r0, struct ll *r1, ll_compare_func *compare, void *aux)
{
struct ll *pre_r0;
- size_t output_run_cnt;
+ size_t output_run_len;
if (r0 == r1 || ll_next (r0) == r1)
return;
do
{
struct ll *a0 = ll_next (pre_r0);
- for (output_run_cnt = 1; ; output_run_cnt++)
+ for (output_run_len = 1; ; output_run_len++)
{
struct ll *a1 = ll_find_run (a0, r1, compare, aux);
struct ll *a2 = ll_find_run (a1, r1, compare, aux);
a0 = ll_merge (a0, a1, a1, a2, compare, aux);
}
}
- while (output_run_cnt > 1);
+ while (output_run_len > 1);
}
/* Finds the extent of a run of nodes of increasing value