X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fll.c;h=887b58039e352e32fa2b0e5ee9b9be51be85f28f;hb=e7913c62251710319b06c50702c5db9afb612be5;hp=21f8dd8870a2fc96b48ccfd49c228aeb7bc3db21;hpb=fe8dc2171009e90d2335f159d05f7e6660e24780;p=pspp

diff --git a/src/libpspp/ll.c b/src/libpspp/ll.c
index 21f8dd8870..887b58039e 100644
--- a/src/libpspp/ll.c
+++ b/src/libpspp/ll.c
@@ -30,7 +30,6 @@
 
 #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. */
@@ -122,7 +121,7 @@ ll_remove_equal (struct ll *r0, struct ll *r1, struct ll *target,
   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);
@@ -145,7 +144,7 @@ ll_remove_if (struct ll *r0, struct ll *r1,
   size_t count;
 
   count = 0;
-  for (x = r0; x != r1; )
+  for (x = r0; x != r1;)
     if (predicate (x, aux))
       {
         x = ll_remove (x);
@@ -435,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;
@@ -444,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);
@@ -454,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