X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Flinreg%2Flinreg.c;h=6c433e68b3d5774e0606ac3f32b22fe24da580dd;hb=f5c108becd49d78f4898cab11352291f5689d24e;hp=9224cc6bad9332769a8797b783719d235a2cbb82;hpb=9f650fc3d2946c216e6cd3c7922a8a63d0f97117;p=pspp-builds.git

diff --git a/src/math/linreg/linreg.c b/src/math/linreg/linreg.c
index 9224cc6b..6c433e68 100644
--- a/src/math/linreg/linreg.c
+++ b/src/math/linreg/linreg.c
@@ -1,18 +1,18 @@
 /*
   lib/linreg/linreg.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.
@@ -95,7 +95,7 @@ linreg_mean_std (gsl_vector_const_view v, double *mp, double *sp, double *ssp)
   The return value is the number of distinct variables found.
  */
 int
-pspp_linreg_get_vars (const void *c_, struct variable **v)
+pspp_linreg_get_vars (const void *c_, const struct variable **v)
 {
   const pspp_linreg_cache *c = c_;
   struct pspp_coeff *coef = NULL;
@@ -114,7 +114,7 @@ pspp_linreg_get_vars (const void *c_, struct variable **v)
   /*
      Start at c->coeff[1] to avoid the intercept.
    */
-  v[result] = (struct variable *) pspp_coeff_get_var (c->coeff[1], 0);
+  v[result] =  pspp_coeff_get_var (c->coeff[1], 0);
   result = (v[result] == NULL) ? 0 : 1;
 
   for (coef = c->coeff[2]; coef < c->coeff[c->n_coeffs]; coef++)
@@ -130,7 +130,7 @@ pspp_linreg_get_vars (const void *c_, struct variable **v)
 	}
       if (i < 0 && result < c->n_coeffs)
 	{
-	  v[result] = (struct variable *) tmp;
+	  v[result] = tmp;
 	  result++;
 	}
     }
@@ -152,10 +152,10 @@ pspp_linreg_cache_alloc (size_t n, size_t p)
   c->indep_means = gsl_vector_alloc (p);
   c->indep_std = gsl_vector_alloc (p);
   c->ssx = gsl_vector_alloc (p);	/* Sums of squares for the
-					   independent variables. 
+					   independent variables.
 					 */
   c->ss_indeps = gsl_vector_alloc (p);	/* Sums of squares for the
-					   model parameters. 
+					   model parameters.
 					 */
   c->cov = gsl_matrix_alloc (p + 1, p + 1);	/* Covariance matrix. */
   c->n_obs = n;
@@ -182,15 +182,18 @@ pspp_linreg_cache_free (void *m)
   int i;
 
   pspp_linreg_cache *c = m;
-  gsl_vector_free (c->indep_means);
-  gsl_vector_free (c->indep_std);
-  gsl_vector_free (c->ss_indeps);
-  gsl_matrix_free (c->cov);
-  for (i = 0; i < c->n_coeffs; i++)
+  if (c != NULL)
     {
-      pspp_coeff_free (c->coeff[i]);
+      gsl_vector_free (c->indep_means);
+      gsl_vector_free (c->indep_std);
+      gsl_vector_free (c->ss_indeps);
+      gsl_matrix_free (c->cov);
+      for (i = 0; i < c->n_coeffs; i++)
+	{
+	  pspp_coeff_free (c->coeff[i]);
+	}
+      free (c);
     }
-  free (c);
   return true;
 }
 
@@ -246,7 +249,7 @@ pspp_linreg (const gsl_vector * Y, const gsl_matrix * X,
   cache->dfm = cache->n_indeps;
   cache->dfe = cache->dft - cache->dfm;
   cache->n_coeffs = X->size2 + 1;	/* Adjust this later to allow for
-					   regression through the origin. 
+					   regression through the origin.
 					 */
   if (cache->method == PSPP_LINREG_SWEEP)
     {