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

[Jason H Stover]

Index: pspp/src/cat.c
diff -u pspp/src/cat.c:1.3 pspp/src/cat.c:1.4
--- pspp/src/cat.c:1.3  Thu Oct 13 19:25:01 2005
+++ pspp/src/cat.c      Thu Oct 13 19:58:54 2005
@@ -65,8 +65,7 @@
   rc->v = v;
   rc->n_categories = 0;
   rc->n_allocated_categories = N_INITIAL_CATEGORIES;
-  rc->vals = xmalloc (N_INITIAL_CATEGORIES *
-                     sizeof (*rc->vals));
+  rc->vals = xmalloc (N_INITIAL_CATEGORIES * sizeof (*rc->vals));
 
   return rc;
 }
@@ -146,8 +145,8 @@
       if (rc->n_categories >= rc->n_allocated_categories)
        {
          rc->n_allocated_categories *= 2;
-         rc->vals =  xrealloc (rc->vals, rc->n_allocated_categories
-                               * sizeof (*(rc->vals)));
+         rc->vals = xrealloc (rc->vals, rc->n_allocated_categories
+                              * sizeof (*(rc->vals)));
        }
       rc->vals[rc->n_categories] = *v;
       rc->n_categories++;
@@ -221,7 +220,7 @@
   to the value v.
  */
 static gsl_vector_view
-cr_value_to_vector (const union value * v, struct recoded_categorical * cr)
+cr_value_to_vector (const union value *v, struct recoded_categorical *cr)
 {
   size_t row;
   row = cr_value_to_subscript (v, cr);
@@ -415,7 +414,7 @@
       dmv = dm->vars[i];
       if ((dmv.v)->index == index)
        {
-         return dmv.v;
+         return (struct variable *) dmv.v;
        }
     }
   return NULL;