X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fdata%2Fdatasheet-test.c;h=e3dad3b32c8a9b826656c38e32dc1a278cc91671;hb=17ca35e4ca8abf4ba0c0ae82920b985fa17648cf;hp=15e2c488fc3051e997948779f0d310ac97c07a27;hpb=f481fd69631024bcdc7dc2369bbc1592d7a43ac7;p=pspp diff --git a/tests/data/datasheet-test.c b/tests/data/datasheet-test.c index 15e2c488fc..e3dad3b32c 100644 --- a/tests/data/datasheet-test.c +++ b/tests/data/datasheet-test.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2009, 2010, 2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -153,9 +154,10 @@ check_datasheet_casereader (struct mc *mc, struct casereader *reader, { if (width == 0) mc_error (mc, "element %zu,%zu (of %zu,%zu) differs: " - "%g != %g", + "%.*g != %.*g", row, col, n_rows, n_columns, - case_num_idx (c, col), array[row][col].f); + DBL_DIG + 1, case_num_idx (c, col), + DBL_DIG + 1, array[row][col].f); else mc_error (mc, "element %zu,%zu (of %zu,%zu) differs: " "'%.*s' != '%.*s'", @@ -217,8 +219,8 @@ check_datasheet (struct mc *mc, struct datasheet *ds, { if (width == 0) mc_error (mc, "element %zu,%zu (of %zu,%zu) differs: " - "%g != %g", row, col, n_rows, n_columns, - v.f, av->f); + "%.*g != %.*g", row, col, n_rows, n_columns, + DBL_DIG + 1, v.f, DBL_DIG + 1, av->f); else mc_error (mc, "element %zu,%zu (of %zu,%zu) differs: " "'%.*s' != '%.*s'", @@ -485,9 +487,9 @@ struct resize_cb_aux }; static void -resize_cb (const union value *old_value, union value *new_value, void *aux_) +resize_cb (const union value *old_value, union value *new_value, const void *aux_) { - struct resize_cb_aux *aux = aux_; + const struct resize_cb_aux *aux = aux_; value_from_param (new_value, aux->new_width, value_hash (old_value, aux->old_width, 0)); @@ -893,7 +895,7 @@ main (int argc, char *argv[]) params.n_widths = 3; params.next_value = 1; - /* Parse comand line. */ + /* Parse command line. */ parser = argv_parser_create (); options = mc_options_create (); mc_options_register_argv_parser (options, parser);