X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Faggregate.c;h=86f35287c01f7a9ade2982728e8f8ebfede67e97;hb=d7b5d9144738a5a8989d45a01f4e458a78b68c0b;hp=5979204d08c0c407a078f2ca1ad367665ff0ed67;hpb=c9e2bf6cb988f8c00d89ccf191a28388cccbd868;p=pspp

diff --git a/src/aggregate.c b/src/aggregate.c
index 5979204d08..86f35287c0 100644
--- a/src/aggregate.c
+++ b/src/aggregate.c
@@ -77,7 +77,7 @@ enum
 struct agr_func
   {
     const char *name;		/* Aggregation function name. */
-    int n_args;			/* Number of arguments. */
+    size_t n_args;              /* Number of arguments. */
     int alpha_type;		/* When given ALPHA arguments, output type. */
     struct fmt_spec format;	/* Format spec if alpha_type != ALPHA. */
   };
@@ -336,7 +336,7 @@ parse_aggregate_functions (struct agr_proc *agr)
     {
       char **dest;
       char **dest_label;
-      int n_dest;
+      size_t n_dest;
 
       int include_missing;
       const struct agr_func *function;
@@ -345,9 +345,9 @@ parse_aggregate_functions (struct agr_proc *agr)
       union value arg[2];
 
       struct variable **src;
-      int n_src;
+      size_t n_src;
 
-      int i;
+      size_t i;
 
       dest = NULL;
       dest_label = NULL;
@@ -361,7 +361,7 @@ parse_aggregate_functions (struct agr_proc *agr)
       /* Parse the list of target variables. */
       while (!lex_match ('='))
 	{
-	  int n_dest_prev = n_dest;
+	  size_t n_dest_prev = n_dest;
 	  
 	  if (!parse_DATA_LIST_vars (&dest, &n_dest,
                                      PV_APPEND | PV_SINGLE | PV_NO_SCRATCH))
@@ -371,7 +371,7 @@ parse_aggregate_functions (struct agr_proc *agr)
 	  {
 	    int j;
 
-	    dest_label = xrealloc (dest_label, sizeof *dest_label * n_dest);
+	    dest_label = xnrealloc (dest_label, n_dest, sizeof *dest_label);
 	    for (j = n_dest_prev; j < n_dest; j++)
 	      dest_label[j] = NULL;
 	  }
@@ -486,9 +486,9 @@ parse_aggregate_functions (struct agr_proc *agr)
 	     like `unknown variable t'. */
 	  if (n_src != n_dest)
 	    {
-	      msg (SE, _("Number of source variables (%d) does not match "
-			 "number of target variables (%d)."),
-		   n_src, n_dest);
+	      msg (SE, _("Number of source variables (%u) does not match "
+			 "number of target variables (%u)."),
+		   (unsigned) n_src, (unsigned) n_dest);
 	      goto error;
 	    }
 
@@ -663,8 +663,8 @@ agr_destroy (struct agr_proc *agr)
 
       if (iter->function & FSTRING)
 	{
-	  int n_args;
-	  int i;
+	  size_t n_args;
+	  size_t i;
 
 	  n_args = agr_func_tab[iter->function & FUNC].n_args;
 	  for (i = 0; i < n_args; i++)