projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefiles: Make a couple of targets build more quietly.
[pspp]
/
src
/
libpspp
/
ll.c
diff --git
a/src/libpspp/ll.c
b/src/libpspp/ll.c
index a7f8027085a3d73dbe91a3260ac90edbcdb0a111..887b58039e352e32fa2b0e5ee9b9be51be85f28f 100644
(file)
--- a/
src/libpspp/ll.c
+++ b/
src/libpspp/ll.c
@@
-121,7
+121,7
@@
ll_remove_equal (struct ll *r0, struct ll *r1, struct ll *target,
size_t count;
count = 0;
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);
if (compare (x, target, aux) == 0)
{
x = ll_remove (x);
@@
-144,7
+144,7
@@
ll_remove_if (struct ll *r0, struct ll *r1,
size_t count;
count = 0;
size_t count;
count = 0;
- for (x = r0; x != r1;
)
+ for (x = r0; x != r1;)
if (predicate (x, aux))
{
x = ll_remove (x);
if (predicate (x, aux))
{
x = ll_remove (x);
@@
-434,7
+434,7
@@
void
ll_sort (struct ll *r0, struct ll *r1, ll_compare_func *compare, void *aux)
{
struct ll *pre_r0;
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;
if (r0 == r1 || ll_next (r0) == r1)
return;
@@
-443,7
+443,7
@@
ll_sort (struct ll *r0, struct ll *r1, ll_compare_func *compare, void *aux)
do
{
struct ll *a0 = ll_next (pre_r0);
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);
{
struct ll *a1 = ll_find_run (a0, r1, compare, aux);
struct ll *a2 = ll_find_run (a1, r1, compare, aux);
@@
-453,7
+453,7
@@
ll_sort (struct ll *r0, struct ll *r1, ll_compare_func *compare, void *aux)
a0 = ll_merge (a0, a1, a1, a2, 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
}
/* Finds the extent of a run of nodes of increasing value