X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fll.c;h=887b58039e352e32fa2b0e5ee9b9be51be85f28f;hb=339f1956cc727eda788638644ef93ab7852b31cd;hp=619adfac244430b5b6b3e231dd29f075737154a8;hpb=ff7ae14592cbdbebc4e4322424db95663ea7e166;p=pspp diff --git a/src/libpspp/ll.c b/src/libpspp/ll.c index 619adfac24..887b58039e 100644 --- a/src/libpspp/ll.c +++ b/src/libpspp/ll.c @@ -434,7 +434,7 @@ void 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; @@ -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); - 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); @@ -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); } } - while (output_run_cnt > 1); + while (output_run_len > 1); } /* Finds the extent of a run of nodes of increasing value