X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcoefficient.c;h=44b7c0d3219b764b827f704a6b807c60a9adf2e0;hb=a9acce47d67e0ab35ce1690e4f1b1ac0121c2d78;hp=fe0cd43877f3ab57c71f95b8a4b43d30b63098ee;hpb=9f650fc3d2946c216e6cd3c7922a8a63d0f97117;p=pspp

diff --git a/src/math/coefficient.c b/src/math/coefficient.c
index fe0cd43877..44b7c0d321 100644
--- a/src/math/coefficient.c
+++ b/src/math/coefficient.c
@@ -1,22 +1,18 @@
-/*
-  src/math/coefficient.c
-  
-  Copyright (C) 2005 Free Software Foundation, Inc. Written by Jason H Stover.
-  
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU General Public License as published by the Free
-  Software Foundation; either version 2 of the License, or (at your option)
-  any later version.
-  
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-  
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc., 51
-  Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
-*/
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 /*
   Accessor functions for matching coefficients and variables.
@@ -65,12 +61,11 @@ pspp_coeff_init (struct pspp_coeff ** c, const struct design_matrix *X)
       c[i]->n_vars = n_vals;	/* Currently, no procedures allow
 				   interactions.  This line will have to
 				   change when procedures that allow
-				   interaction terms are written. 
+				   interaction terms are written.
 				 */
       c[i]->v_info = xnmalloc (c[i]->n_vars, sizeof (*c[i]->v_info));
       assert (c[i]->v_info != NULL);
-      c[i]->v_info->v =
-	(const struct variable *) design_matrix_col_to_var (X, i);
+      c[i]->v_info->v = design_matrix_col_to_var (X, i);
 
       if (var_is_alpha (c[i]->v_info->v))
 	{
@@ -79,7 +74,7 @@ pspp_coeff_init (struct pspp_coeff ** c, const struct design_matrix *X)
 	  assert (k <= i);
 	  k = i - k;
 	  c[i]->v_info->val =
-	    cat_subscript_to_value (k, (struct variable *) c[i]->v_info->v);
+	    cat_subscript_to_value (k, c[i]->v_info->v);
 	}
     }
 }