From 97cb6edc31abe00d15685a6f8e07dc407a98a7cc Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 22 Jun 2013 11:42:02 +0200 Subject: [PATCH] Fix constness of datasheet_resize_column arguments The aux variable should not be changed, so make it const --- src/data/datasheet.c | 8 ++++---- src/data/datasheet.h | 4 ++-- src/ui/gui/psppire-data-store.c | 4 ++-- tests/data/datasheet-test.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/data/datasheet.c b/src/data/datasheet.c index 1175e20403..54d268fa06 100644 --- a/src/data/datasheet.c +++ b/src/data/datasheet.c @@ -431,8 +431,8 @@ struct resize_datasheet_value_aux size_t src_ofs; int src_width; - void (*resize_cb) (const union value *, union value *, void *aux); - void *resize_cb_aux; + void (*resize_cb) (const union value *, union value *, const void *aux); + const void *resize_cb_aux; union value dst_value; size_t dst_ofs; @@ -460,8 +460,8 @@ resize_datasheet_value (const void *src, void *dst, void *aux_) bool datasheet_resize_column (struct datasheet *ds, size_t column, int new_width, void (*resize_cb) (const union value *, - union value *, void *aux), - void *resize_cb_aux) + union value *, const void *aux), + const void *resize_cb_aux) { struct column old_col; struct column *col; diff --git a/src/data/datasheet.h b/src/data/datasheet.h index ab6c28d80a..425f954747 100644 --- a/src/data/datasheet.h +++ b/src/data/datasheet.h @@ -51,8 +51,8 @@ void datasheet_move_columns (struct datasheet *, size_t cnt); bool datasheet_resize_column (struct datasheet *, size_t column, int new_width, void (*resize_cb) (const union value *, - union value *, void *aux), - void *aux); + union value *, const void *aux), + const void *aux); /* Rows. */ casenumber datasheet_get_n_rows (const struct datasheet *); diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index f3543f13f1..69f64575e0 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -217,9 +217,9 @@ struct resize_datum_aux }; static void -resize_datum (const union value *old, union value *new, void *aux_) +resize_datum (const union value *old, union value *new, const void *aux_) { - struct resize_datum_aux *aux = aux_; + const struct resize_datum_aux *aux = aux_; if (aux->new_width == 0) { diff --git a/tests/data/datasheet-test.c b/tests/data/datasheet-test.c index 15e2c488fc..532b883faa 100644 --- a/tests/data/datasheet-test.c +++ b/tests/data/datasheet-test.c @@ -485,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)); -- 2.30.2