Fix constness of datasheet_resize_column arguments

The aux variable should not be changed, so make it const

diff --git a/src/data/datasheet.c b/src/data/datasheet.c
index 1175e20403eeb0fed73cf95a972beddb860766f8..54d268fa064100ba28c040c757df11388bb7976c 100644 (file)
--- 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 ab6c28d80af56697d18151ac7884106487b7ebfb..425f95474762d756c98125f6293fbaf7a34293db 100644 (file)
--- 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 f3543f13f1c65551bb3fae638daff4be93903e1e..69f64575e0df3b13b686ead025a10ce20a4c05c2 100644 (file)
--- 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 15e2c488fc3051e997948779f0d310ac97c07a27..532b883faa1980f0671e249a27a9b1d71c5728ee 100644 (file)
--- 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));