X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fdata%2Fdatasheet-test.c;h=532b883faa1980f0671e249a27a9b1d71c5728ee;hb=01f35481fe6f80ee35c79bf873bc69af11331217;hp=c46c268376c77031baff7e6c06fa14a44808bd65;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp diff --git a/tests/data/datasheet-test.c b/tests/data/datasheet-test.c index c46c268376..532b883faa 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 Free Software Foundation, Inc. + Copyright (C) 2007, 2009, 2010 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 @@ -424,9 +424,12 @@ datasheet_mc_init (struct mc *mc) if (params->backing_rows == 0 && params->n_backing_cols == 0) { /* Create unbacked datasheet. */ + struct caseproto *proto; ds = datasheet_create (NULL); mc_name_operation (mc, "empty datasheet"); - check_datasheet (mc, ds, NULL, 0, caseproto_create ()); + proto = caseproto_create (); + check_datasheet (mc, ds, NULL, 0, proto); + caseproto_unref (proto); } else { @@ -482,9 +485,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)); @@ -748,7 +751,7 @@ enum N_DATASHEET_OPTIONS }; -static struct argv_option datasheet_argv_options[N_DATASHEET_OPTIONS] = +static const struct argv_option datasheet_argv_options[N_DATASHEET_OPTIONS] = { {"max-rows", 0, required_argument, OPT_MAX_ROWS}, {"max-columns", 0, required_argument, OPT_MAX_COLUMNS},