Change type of variables whose addresses are passed to dict_get_vars()

from size_t to int to match John's previous change to dict_get_vars().

diff --git a/src/ChangeLog b/src/ChangeLog
index 199f8ec52c4d48f8f76c79bc939453ebf5cec4dc..85dcaa8e4dc79aca85af5ad3afa7e4e4c98a574e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+Sat Sep 17 11:13:13 2005  Ben Pfaff  <blp@gnu.org>
+
+       * matrix-data.c: (cmd_matrix_data) Change type of variable whose
+       address is passed to dict_get_vars() from size_t to int to match
+       John's change below.
+
+       * modify-vars.c: (validate_var_modification) Ditto.
+
 Mon Sep 12 19:26:06 WST 2005 John Darrington <john@darrington.wattle.id.au>
 
        * dictionary.[ch]  Changed cnt from size_t* to int* since that's

diff --git a/src/matrix-data.c b/src/matrix-data.c
index e90b2ac68e8ea818ca2f4d4c9384a9c1fc44f83b..e0dfdcee4c2d036a5179926a0b5124aa9c59dee2 100644 (file)
--- a/src/matrix-data.c
+++ b/src/matrix-data.c
@@ -571,7 +571,7 @@ cmd_matrix_data (void)
      system file output. */
   {
     struct variable **v;
-    size_t nv;
+    int nv;
 
     dict_get_vars (default_dict, &v, &nv, 0);
     qsort (v, nv, sizeof *v, compare_variables_by_mxd_var_type);

diff --git a/src/modify-vars.c b/src/modify-vars.c
index 86ef2b3c54666ad59320bdff93caad793e8e709c..20898e0a8c525360a88c49ef4556ebfdd2c366af 100644 (file)
--- a/src/modify-vars.c
+++ b/src/modify-vars.c
@@ -390,7 +390,8 @@ validate_var_modification (const struct dictionary *d,
   struct variable **all_vars;
   struct variable **keep_vars;
   struct variable **drop_vars;
-  size_t all_cnt, keep_cnt, drop_cnt;
+  size_t keep_cnt, drop_cnt;
+  int all_cnt;
 
   struct var_renaming *var_renaming;
   int valid;