X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdatasheet.c;h=74da1116a579e539178461917c5561259b557544;hb=daa6b310fb333148f7db500858b54aa07d56fc75;hp=e9d2b2f3528f8aef209809df6677b4e76e0dc047;hpb=7a09f7e0127967c4f04a51f1b9cf91040c515c34;p=pspp

diff --git a/src/data/datasheet.c b/src/data/datasheet.c
index e9d2b2f352..74da1116a5 100644
--- a/src/data/datasheet.c
+++ b/src/data/datasheet.c
@@ -175,7 +175,7 @@ value_to_data (const union value *value_, int width)
   if (width == 0)
     return &value->f;
   else
-    return value_str_rw (value, width);
+    return value->s;
 }
 
 /* Returns the number of bytes needed to store all the values in
@@ -625,37 +625,37 @@ datasheet_insert_rows (struct datasheet *ds,
   while (cnt > 0)
     {
       unsigned long first_phy;
-      unsigned long phy_cnt;
+      unsigned long n_phys;
       unsigned long i;
 
       /* Allocate physical rows from the pool of available
          rows. */
-      if (!axis_allocate (ds->rows, cnt, &first_phy, &phy_cnt))
+      if (!axis_allocate (ds->rows, cnt, &first_phy, &n_phys))
         {
           /* No rows were available.  Extend the row axis to make
              some new ones available. */
-          phy_cnt = cnt;
+          n_phys = cnt;
           first_phy = axis_extend (ds->rows, cnt);
         }
 
       /* Insert the new rows into the row mapping. */
-      axis_insert (ds->rows, before, first_phy, phy_cnt);
+      axis_insert (ds->rows, before, first_phy, n_phys);
 
       /* Initialize the new rows. */
-      for (i = 0; i < phy_cnt; i++)
+      for (i = 0; i < n_phys; i++)
         if (!datasheet_put_row (ds, before + i, c[i]))
           {
             while (++i < cnt)
               case_unref (c[i]);
-            datasheet_delete_rows (ds, before - added, phy_cnt + added);
+            datasheet_delete_rows (ds, before - added, n_phys + added);
             return false;
           }
 
       /* Advance. */
-      c += phy_cnt;
-      cnt -= phy_cnt;
-      before += phy_cnt;
-      added += phy_cnt;
+      c += n_phys;
+      cnt -= n_phys;
+      before += n_phys;
+      added += n_phys;
     }
   return true;
 }
@@ -734,10 +734,10 @@ datasheet_reader_destroy (struct casereader *reader UNUSED, void *ds_)
 /* "advance" function for the datasheet random casereader. */
 static void
 datasheet_reader_advance (struct casereader *reader UNUSED, void *ds_,
-                          casenumber case_cnt)
+                          casenumber n_cases)
 {
   struct datasheet *ds = ds_;
-  datasheet_delete_rows (ds, 0, case_cnt);
+  datasheet_delete_rows (ds, 0, n_cases);
 }
 
 /* Random casereader class for a datasheet. */
@@ -819,7 +819,7 @@ rw_case (struct datasheet *ds, enum rw_op op,
   assert (start_column + n_columns <= datasheet_get_n_columns (ds));
 
   prow = axis_map (ds->rows, lrow);
-  for (i = 0; i < n_columns; )
+  for (i = 0; i < n_columns;)
     {
       struct source *source = columns[i].source;
       size_t j;