X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fllx.c;h=eb4e5d400f10a9ae8d86da310109a3819516907a;hb=e43a19f339e8eb3a652754001f6668ae0747308c;hp=b2e9ead3a6fd1a0b749c976a98fb853e6099e539;hpb=078b003b3171c6158a3419a01189b9658896f470;p=pspp diff --git a/src/libpspp/llx.c b/src/libpspp/llx.c index b2e9ead3a6..eb4e5d400f 100644 --- a/src/libpspp/llx.c +++ b/src/libpspp/llx.c @@ -164,7 +164,7 @@ llx_remove_range (struct llx *r0, struct llx *r1, { struct llx *llx; - for (llx = r0; llx != r1; ) + for (llx = r0; llx != r1;) llx = llx_remove (llx, manager); } @@ -181,7 +181,7 @@ llx_remove_equal (struct llx *r0, struct llx *r1, const void *target, size_t count; count = 0; - for (x = r0; x != r1; ) + for (x = r0; x != r1;) if (compare (llx_data (x), target, aux) == 0) { x = llx_remove (x, manager); @@ -206,7 +206,7 @@ llx_remove_if (struct llx *r0, struct llx *r1, size_t count; count = 0; - for (x = r0; x != r1; ) + for (x = r0; x != r1;) if (predicate (llx_data (x), aux)) { x = llx_remove (x, manager); @@ -493,7 +493,7 @@ void llx_sort (struct llx *r0, struct llx *r1, llx_compare_func *compare, void *aux) { struct llx *pre_r0; - size_t output_run_cnt; + size_t output_run_len; if (r0 == r1 || llx_next (r0) == r1) return; @@ -502,7 +502,7 @@ llx_sort (struct llx *r0, struct llx *r1, llx_compare_func *compare, void *aux) do { struct llx *a0 = llx_next (pre_r0); - for (output_run_cnt = 1; ; output_run_cnt++) + for (output_run_len = 1; ; output_run_len++) { struct llx *a1 = llx_find_run (a0, r1, compare, aux); struct llx *a2 = llx_find_run (a1, r1, compare, aux); @@ -512,7 +512,7 @@ llx_sort (struct llx *r0, struct llx *r1, llx_compare_func *compare, void *aux) a0 = llx_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