segment: Fix 1-byte read past initialized data when file ends in CR.

[pspp] / tests / libpspp / sparse-xarray-test.c

diff --git a/tests/libpspp/sparse-xarray-test.c b/tests/libpspp/sparse-xarray-test.c
index dd5a2a99307d2dee4c60cf524c9d8c63ac73d14e..47b338a65d2ee1dbee00b909326bce13e4b25ee4 100644 (file)
--- a/tests/libpspp/sparse-xarray-test.c
+++ b/tests/libpspp/sparse-xarray-test.c
@@ -73,6 +73,7 @@ test_state_destroy (const struct test_params *params, struct test_state *ts)
 
   for (i = 0; i < params->n_xarrays; i++)
     sparse_xarray_destroy (ts->xarrays[i]);
+  free (ts);
 }
 
 static struct test_state *
@@ -182,7 +183,7 @@ check_state (struct mc *mc, struct test_state *ts, const struct test_model *tm)
           for (col = 0; col < params->n_columns; col++)
             if (data[col] != model->data[row][col])
               {
-                mc_error (mc, "xarray %d: element %zu,%zu (of %zu,%zu) "
+                mc_error (mc, "xarray %d: element %d,%d (of %d,%d) "
                           "differs: %d should be %d",
                           i, row, col, n_rows, n_columns, data[col],
                           model->data[row][col]);
@@ -201,7 +202,7 @@ check_state (struct mc *mc, struct test_state *ts, const struct test_model *tm)
               ds_clear (&ds);
               for (col = 0; col < n_columns; col++)
                 ds_put_format (&ds, " %d", model->data[row][col]);
-              mc_error (mc, "xarray %d: row %zu:%s", i, row, ds_cstr (&ds));
+              mc_error (mc, "xarray %d: row %d:%s", i, row, ds_cstr (&ds));
             }
 
           mc_error (mc, "xarray %d: actual:", i);
@@ -216,7 +217,7 @@ check_state (struct mc *mc, struct test_state *ts, const struct test_model *tm)
               ds_clear (&ds);
               for (col = 0; col < n_columns; col++)
                 ds_put_format (&ds, " %d", data[col]);
-              mc_error (mc, "xarray %d: row %zu:%s", i, row, ds_cstr (&ds));
+              mc_error (mc, "xarray %d: row %d:%s", i, row, ds_cstr (&ds));
             }
 
           ds_destroy (&ds);
@@ -273,8 +274,8 @@ sparse_xarray_mc_init (struct mc *mc)
   struct test_model tm;
   int i;
 
-  mc_name_operation (mc, "empty sparse_xarray with n_columns=%zu, "
-                     "max_memory_rows=%zu",
+  mc_name_operation (mc, "empty sparse_xarray with n_columns=%d, "
+                     "max_memory_rows=%d",
                      params->n_columns, params->max_memory_rows);
   ts = xmalloc (sizeof *ts);
   for (i = 0; i < params->n_xarrays; i++)
@@ -471,10 +472,9 @@ usage (void)
           "  --no-copy-columns    Do not copy column ranges in an xarray\n",
           program_name, program_name);
   mc_options_usage ();
-  fputs ("\nOther options:\n"
+  printf ("\nOther options:\n"
          "  --help               Display this help message\n"
-         "\nReport bugs to <bug-gnu-pspp@gnu.org>\n",
-         stdout);
+          "\nReport bugs to <%s>\n", PACKAGE_BUGREPORT);
   exit (0);
 }
 \f