X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcasereader-shim.c;h=6d3a78829df9d19b2fffc2f2afa1fd7de8b389ca;hb=e0b27f6f4cde2d52508db337c76ea81a8ca8ee79;hp=9d9dd705277bc432bff39b1c77c6f95971516844;hpb=0fbcb6682003e6deb5f517c4d54bada0301a61a1;p=pspp

diff --git a/src/data/casereader-shim.c b/src/data/casereader-shim.c
index 9d9dd70527..6d3a78829d 100644
--- a/src/data/casereader-shim.c
+++ b/src/data/casereader-shim.c
@@ -44,16 +44,16 @@ static bool buffer_case (struct casereader_shim *s);
    Returns the new shim.  The only legitimate use of the returned
    casereader_shim is for calling casereader_shim_slurp().  If READER has no
    clones already (which the caller should ensure, if it plans to use the
-   return value), then the returned casreader_shim is valid for that purpose
+   return value), then the returned casereader_shim is valid for that purpose
    until, and only until, the READER's 'destroy' function is called. */
 struct casereader_shim *
 casereader_shim_insert (struct casereader *reader)
 {
   const struct caseproto *proto = casereader_get_proto (reader);
-  casenumber case_cnt = casereader_get_case_cnt (reader);
+  casenumber n_cases = casereader_get_n_cases (reader);
   struct casereader_shim *s = xmalloc (sizeof *s);
   s->window = casewindow_create (proto, settings_get_workspace_cases (proto));
-  s->subreader = casereader_create_random (proto, case_cnt, &shim_class, s);
+  s->subreader = casereader_create_random (proto, n_cases, &shim_class, s);
   casereader_swap (reader, s->subreader);
   taint_propagate (casewindow_get_taint (s->window),
                    casereader_get_taint (reader));
@@ -107,7 +107,7 @@ casereader_shim_read (struct casereader *reader UNUSED, void *s_,
 {
   struct casereader_shim *s = s_;
 
-  while (casewindow_get_case_cnt (s->window) <= offset)
+  while (casewindow_get_n_cases (s->window) <= offset)
     if (!buffer_case (s))
       return false;
 
@@ -124,13 +124,13 @@ casereader_shim_destroy (struct casereader *reader UNUSED, void *s_)
   free (s);
 }
 
-/* Discards CNT cases from the front of S's window. */
+/* Discards N_CASES cases from the front of S's window. */
 static void
 casereader_shim_advance (struct casereader *reader UNUSED, void *s_,
-                         casenumber case_cnt)
+                         casenumber n_cases)
 {
   struct casereader_shim *s = s_;
-  casewindow_pop_tail (s->window, case_cnt);
+  casewindow_pop_tail (s->window, n_cases);
 }
 
 /* Class for the buffered reader. */