[Pspp-cvs] Changes to pspp/src/count.c

[Ben Pfaff]

Index: pspp/src/count.c
diff -u pspp/src/count.c:1.21 pspp/src/count.c:1.22
--- pspp/src/count.c:1.21       Mon Oct 24 02:51:32 2005
+++ pspp/src/count.c    Wed Oct 26 05:06:14 2005
@@ -230,7 +230,7 @@
 
 /* Parses a set of numeric criterion values. */
 static int
-parse_numeric_criteria (struct counting * c)
+parse_numeric_criteria (struct counting *c)
 {
   size_t n = 0;
   size_t m = 0;
@@ -243,7 +243,7 @@
       if (n + 1 >= m)
        {
          m += 16;
-         c->crit.n = xrealloc (c->crit.n, m * sizeof (struct cnt_num));
+         c->crit.n = xnrealloc (c->crit.n, m, sizeof *c->crit.n);
        }
 
       cur = &c->crit.n[n++];
@@ -324,7 +324,7 @@
 /* Parses a set of string criteria values.  The skeleton is the same
    as parse_numeric_criteria(). */
 static int
-parse_string_criteria (struct counting * c)
+parse_string_criteria (struct counting *c)
 {
   int len = 0;
 
@@ -344,7 +344,7 @@
       if (n + 1 >= m)
        {
          m += 16;
-         c->crit.n = xrealloc (c->crit.n, m * sizeof (struct cnt_str));
+         c->crit.s = xnrealloc (c->crit.s, m, sizeof *c->crit.s);
        }
 
       if (!lex_force_string ())
@@ -368,7 +368,7 @@
 
 /* Counts the number of values in case C matching counting CNT. */
 static inline int
-count_numeric (struct counting * cnt, struct ccase * c)
+count_numeric (struct counting *cnt, struct ccase *c)
 {
   int counter = 0;
   size_t i;
@@ -433,7 +433,7 @@
 
 /* Counts the number of values in case C matching counting CNT. */
 static inline int
-count_string (struct counting * cnt, struct ccase * c)
+count_string (struct counting *cnt, struct ccase *c)
 {
   int counter = 0;
   size_t i;
@@ -466,7 +466,7 @@
 
 /* Performs the COUNT transformation T on case C. */
 static int
-count_trns_proc (struct trns_header * trns, struct ccase * c,
+count_trns_proc (struct trns_header *trns, struct ccase *c,
                  int case_num UNUSED)
 {
   struct cnt_var_info *info;
@@ -488,7 +488,7 @@
 
 /* Destroys all dynamic data structures associated with T. */
 static void
-count_trns_free (struct trns_header * t)
+count_trns_free (struct trns_header *t)
 {
   struct cnt_var_info *iter, *next;