Completely rewrite src/data/format.[ch], to achieve better

[pspp-builds.git] / src / language / data-io / matrix-data.c

diff --git a/src/language/data-io/matrix-data.c b/src/language/data-io/matrix-data.c
index 1a5867959be5ca1c9aee5f63400828513cee8068..5398cd69129072cef2de088b9d176c832924d2db 100644 (file)
--- a/src/language/data-io/matrix-data.c
+++ b/src/language/data-io/matrix-data.c
@@ -1,5 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
    Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
@@ -871,7 +871,7 @@ static int
          di.e = ss_end (s);
          di.v = (union value *) &token->number;
          di.f1 = dfm_get_column (reader, di.s);
-         di.format = make_output_format (FMT_F, token->length, 0);
+         di.format = fmt_for_output (FMT_F, token->length, 0);
 
          data_in (&di);
        }
@@ -1584,7 +1584,7 @@ wr_read_splits (struct wr_aux_data *wr,
 
 /* Compares doubles A and B, treating SYSMIS as greatest. */
 static int
-compare_doubles (const void *a_, const void *b_, void *aux UNUSED)
+compare_doubles (const void *a_, const void *b_, const void *aux UNUSED)
 {
   const double *a = a_;
   const double *b = b_;
@@ -1604,9 +1604,9 @@ compare_doubles (const void *a_, const void *b_, void *aux UNUSED)
 /* Return strcmp()-type comparison of the MX->n_factors factors at _A and
    _B.  Sort missing values toward the end. */
 static int
-compare_factors (const void *a_, const void *b_, void *mx_)
+compare_factors (const void *a_, const void *b_, const void *mx_)
 {
-  struct matrix_data_pgm *mx = mx_;
+  const struct matrix_data_pgm *mx = mx_;
   struct factor_data *const *pa = a_;
   struct factor_data *const *pb = b_;
   const double *a = (*pa)->factors;