From: Ben Pfaff <blp@gnu.org>
Date: Sat, 17 Sep 2005 18:15:38 +0000 (+0000)
Subject: Change type of variables whose addresses are passed to dict_get_vars()
X-Git-Tag: sav-api~2228
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b8514ebb8a7b10eb5d911a231a9fc7974f8ba9;p=pspp

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 199f8ec52c..85dcaa8e4d 100644
--- 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 e90b2ac68e..e0dfdcee4c 100644
--- 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 86ef2b3c54..20898e0a8c 100644
--- 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;