X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flist.q;h=c875e6f53a17d81136879c37db39a109db956974;hb=c87013b64d1731dac5da8f738ae8d1b4c1030a90;hp=5e312f81e9eea28e620ffc9c4b42da608534a78d;hpb=5906e30c29662d12594199e1652ba3a7e5670944;p=pspp-builds.git

diff --git a/src/list.q b/src/list.q
index 5e312f81..c875e6f5 100644
--- a/src/list.q
+++ b/src/list.q
@@ -227,7 +227,7 @@ cmd_list (void)
   determine_layout ();
 
   case_num = 0;
-  procedure (write_all_headers, list_cases, NULL, NULL);
+  procedure_with_splits (write_all_headers, list_cases, NULL, NULL);
   free (line_buf);
 
   clean_up ();
@@ -669,19 +669,15 @@ list_cases (struct ccase *c, void *aux UNUSED)
 		memset(&line_buf[x], ' ', width - v->print.w);
 		x += width - v->print.w;
 	      }
-	  
-	    {
-	      union value value;
-	    
-	      if (formats[v->print.type].cat & FCAT_STRING)
-		value.c = c->data[v->fv].s;
-	      else if (v->fv == -1)
-		value.f = case_num;
-	      else
-		value.f = c->data[v->fv].f;
-		
-	      data_out (&line_buf[x], &v->print, &value);
-	    }
+
+            if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1)
+	      data_out (&line_buf[x], &v->print, &c->data[v->fv]);
+            else 
+              {
+                union value case_num_value;
+                case_num_value.f = case_num;
+                data_out (&line_buf[x], &v->print, &case_num_value); 
+              }
 	    x += v->print.w;
 	  
 	    line_buf[x++] = ' ';
@@ -706,17 +702,16 @@ list_cases (struct ccase *c, void *aux UNUSED)
 	for (column = 0; column < cmd.n_variables; column++)
 	  {
 	    struct variable *v = cmd.v_variables[column];
-	    union value value;
 	    char buf[41];
 	    
-	    if (formats[v->print.type].cat & FCAT_STRING)
-	      value.c = c->data[v->fv].s;
-	    else if (v->fv == -1)
-	      value.f = case_num;
-	    else
-	      value.f = c->data[v->fv].f;
-		
-	    data_out (buf, &v->print, &value);
+            if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1)
+	      data_out (buf, &v->print, &c->data[v->fv]);
+            else 
+              {
+                union value case_num_value;
+                case_num_value.f = case_num;
+                data_out (buf, &v->print, &case_num_value); 
+              }
 	    buf[v->print.w] = 0;
 
 	    fprintf (x->file.file, "    <TD ALIGN=RIGHT>%s</TD>\n",