X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmatrix-data.c;h=d3cde3e68a9896076afa9b1b9b3c8c1271c0553a;hb=5ea5547d895d8b0930868378f3eeed39bb3ec731;hp=73d473d177c2f90f8597f2fa73896a5cdf2695f3;hpb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;p=pspp

diff --git a/src/matrix-data.c b/src/matrix-data.c
index 73d473d177..d3cde3e68a 100644
--- a/src/matrix-data.c
+++ b/src/matrix-data.c
@@ -884,9 +884,7 @@ static int
 	  di.e = token->string + token->length;
 	  di.v = (union value *) &token->number;
 	  di.f1 = first_column;
-	  di.format.type = FMT_F;
-	  di.format.w = token->length;
-	  di.format.d = 0;
+	  di.format = make_output_format (FMT_F, token->length, 0);
 
 	  if (!data_in (&di))
 	    return 0;
@@ -1347,8 +1345,8 @@ dump_cell_content (struct matrix_data_pgm *mx, int content, double *cp,
   int type = content_type[content];
 
   {
-    st_bare_pad_copy (case_data_rw (c, mx->rowtype_->fv)->s,
-		      content_names[content], 8);
+    buf_copy_str_rpad (case_data_rw (c, mx->rowtype_->fv)->s, 8,
+                       content_names[content]);
     
     if (type != 1)
       memset (case_data_rw (c, mx->varname_->fv)->s, ' ', 8);
@@ -1369,10 +1367,9 @@ dump_cell_content (struct matrix_data_pgm *mx, int content, double *cp,
 	    cp++;
 	  }
 	if (type == 1)
-	  st_bare_pad_copy (case_data_rw (c, mx->varname_->fv)->s,
-                            dict_get_var (default_dict,
-                                          mx->first_continuous + i)->name,
-			    8);
+	  buf_copy_str_rpad (case_data_rw (c, mx->varname_->fv)->s, 8,
+                             dict_get_var (default_dict,
+                                           mx->first_continuous + i)->name);
 	write_case (wc_data);
       }
   }